Merge from emacs-23

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

diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index bac118704319c03d698521f155330df779c37c2c..ccac0790af35b1b27bb36e0275445240ce5a42a9 100644 (file)
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -1,6 +1,6 @@
 ;;; org-timer.el --- The relative timer code for Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp