Merge from emacs-23

[gnu-emacs] / src / textprop.c

diff --git a/src/textprop.c b/src/textprop.c
index 937c9ab94f634aa8ea4e882d611a691e1a0a6db1..a73c31255fd8a93f3a45cd21855de96f34e1161c 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1,6 +1,6 @@
 /* Interface code for dealing with text properties.
    Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.