Merge from emacs-23

[gnu-emacs] / admin / notes / copyright

diff --git a/admin/notes/copyright b/admin/notes/copyright
index 174d124f39d4bf2821852baaea56a866656ad2d8..cb1c4e0b0e89f9e7aeca278cdc78e0eeace83f59 100644 (file)
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.