Merge from emacs--rel--22
authorMiles Bader <miles@gnu.org>
Thu, 26 Jul 2007 05:18:50 +0000 (05:18 +0000)
committerMiles Bader <miles@gnu.org>
Thu, 26 Jul 2007 05:18:50 +0000 (05:18 +0000)
commitc07bb40b73856e3c40daf1dc6007ea13e3870912
treea98540d6ac5984bf3c5810c7530c974b60fde275
parent4382021fc15f8a52c9dd12bacb7c75dbeb562302
parentef2805c29bb03f0c8c0d4b37a65f511123dcab1c
Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

2007-07-23  Jason Rumney  <jasonr@gnu.org>

   * src/filelock.c (current_lock_owner): Allow for @ sign in username.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828