summaryrefslogtreecommitdiff
path: root/admin/notes/copyright
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-01-14 12:18:41 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2011-01-14 12:18:41 -0500
commit77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree258514dac7faab41642d8f319eb113c8a5f09690 /admin/notes/copyright
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
Merge from emacs-23
Diffstat (limited to 'admin/notes/copyright')
-rw-r--r--admin/notes/copyright2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 174d124f39..cb1c4e0b0e 100644
--- 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.