merge trunk

[gnu-emacs] / lisp / gnus / gnus-setup.el

diff --git a/lisp/gnus/gnus-setup.el b/lisp/gnus/gnus-setup.el
index bd7c3a77c366a6cab3a129e97065fe91df93d929..67c8df6e41fdd5fc4072c16dbebfaed97286a1e3 100644 (file)
--- a/lisp/gnus/gnus-setup.el
+++ b/lisp/gnus/gnus-setup.el
@@ -1,6 +1,6 @@
 ;;; gnus-setup.el --- Initialization & Setup for Gnus 5
 
-;; Copyright (C) 1995-1996, 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1996, 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Steven L. Baur <steve@miranova.com>
 ;; Keywords: news