Merge from emacs-23

This commit is contained in:
Stefan Monnier 2011-01-14 12:18:41 -05:00
commit 77ab81d054
1937 changed files with 2344 additions and 2348 deletions

View file

@ -229,7 +229,7 @@ people who are not programmers.
Edition @value{edition-number}, @value{update-date}
@sp 1
Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1997, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
@sp 1