Merge from mainline.

[gnu-emacs] / src / doprnt.c

diff --git a/src/doprnt.c b/src/doprnt.c
index 8bfa1c7e11bf2aa150203a1508cc6d34e1399f7e..6b07a68c0bc3b1bddf0600157944c913b0def843 100644 (file)
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -2,7 +2,7 @@
    Also takes args differently: pass one pointer to an array of strings
    in addition to the format string which is separate.
    Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.