Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

This commit is contained in:
Paul Eggert 2013-01-02 08:13:04 -08:00
commit 0877d0dc24
2237 changed files with 2783 additions and 2620 deletions

View file

@ -228,7 +228,7 @@ people who are not programmers.
@sp 1
Edition @value{edition-number}, @value{update-date}
@sp 1
Copyright @copyright{} 1990--1995, 1997, 2001--2012 Free Software
Copyright @copyright{} 1990--1995, 1997, 2001--2013 Free Software
Foundation, Inc.
@sp 1