Merge from emacs-23

[bpt/emacs.git] / lisp / org / org-info.el

diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index bbd8fbb..f3a4bdd 100644 (file)
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -1,11 +1,12 @@
 ;;; org-info.el --- Support for links to Info nodes from within Org-Mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.14
+;; Version: 7.4
 ;;
 ;; This file is part of GNU Emacs.
 ;;