From: Miles Bader <miles@gnu.org>
Date: Thu, 26 Jul 2007 05:18:50 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: emacs-pretest-23.0.90~11715
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c07bb40b73856e3c40daf1dc6007ea13e3870912;p=emacs.git

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
---

c07bb40b73856e3c40daf1dc6007ea13e3870912