summaryrefslogtreecommitdiff
path: root/doc/misc/faq.texi
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 /doc/misc/faq.texi
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
Merge from emacs-23
Diffstat (limited to 'doc/misc/faq.texi')
-rw-r--r--doc/misc/faq.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index afcd6098af..691e7bda11 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -12,7 +12,7 @@
@copying
Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009, 2010 Free Software Foundation, Inc.@*
+2009, 2010, 2011 Free Software Foundation, Inc.@*
Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000
Reuven M. Lerner@*
Copyright @copyright{} 1992, 1993 Steven Byrnes@*