From 3ab2c837b302b01fff610f7b83050ab7e703477c Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bastien1@free.fr>
Date: Thu, 28 Jul 2011 17:13:49 +0200
Subject: Merge changes from Org 7.4 to current Org 7.7.

---
 lisp/org/org-docview.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lisp/org/org-docview.el')

diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index ee39d8afc63..e13cdfd666a 100644
--- a/lisp/org/org-docview.el
+++ b/lisp/org/org-docview.el
@@ -1,11 +1,11 @@
 ;;; org-docview.el --- support for links to doc-view-mode buffers
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
+;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -88,5 +88,6 @@ and append it."
 
 (provide 'org-docview)
 
+;; arch-tag: dd147a78-cce1-481b-b40a-15869417debe
 
 ;;; org-docview.el ends here
-- 
cgit v1.2.3