Merge from emacs-23

[gnu-emacs] / doc / misc / faq.texi

diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index afcd6098af18b34b716fc1bc485e378ca106e8c2..691e7bda1103ee86200df6ca8e791bf3da0d8bdc 100644 (file)
--- 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@*