Merge from trunk and resolve conflicts.

[gnu-emacs] / lisp / textmodes / refbib.el

diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index 62fa68ca793c4d07faf19cf6be25bbc13f0ef1a6..975c9396d49bceabd0501f75ab54aeaefb5f9996 100644 (file)
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -1,6 +1,6 @@
 ;;; refbib.el --- convert refer-style references to ones usable by Latex bib
 
-;; Copyright (C) 1989, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: Henry Kautz <kautz@research.att.com>
 ;; Maintainer: FSF