Merge from emacs-23

[gnu-emacs] / lisp / org / org-protocol.el

diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 5d5059fbf0e07442088c51cc857f167870c2b6e5..889303717c59d4ffc0abcec2f0dba66cc61e8c53 100644 (file)
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -1,6 +1,6 @@
 ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions.
 ;;
-;; Copyright (C) 2008, 2009, 2010
+;; Copyright (C) 2008, 2009, 2010, 2011
 ;;          Free Software Foundation, Inc.
 ;;
 ;; Author: Bastien Guerry <bzg AT altern DOT org>