Merge from trunk and resolve conflicts.

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

diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el
index a7ddbf08f7fc5b803813d2904e554c15541a4b76..ee3cdf48e45627a84a5fb49ff96156e57ee25505 100644 (file)
--- a/lisp/gnus/gnus-sieve.el
+++ b/lisp/gnus/gnus-sieve.el
@@ -1,6 +1,6 @@
 ;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: NAGY Andras <nagya@inf.elte.hu>,
 ;;     Simon Josefsson <simon@josefsson.org>