merge from trunk

[gnu-emacs] / lisp / nxml / nxml-enc.el

diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el
index cc621f962cc0b04197e1736f526c69a6497fcede..7bcae56e08e7aac7837be64209304c16d2fbcf01 100644 (file)
--- a/lisp/nxml/nxml-enc.el
+++ b/lisp/nxml/nxml-enc.el
@@ -1,6 +1,6 @@
 ;;; nxml-enc.el --- XML encoding auto-detection
 
-;; Copyright (C) 2003, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML
@@ -146,5 +146,4 @@ Applied to any files that `auto-mode-alist' says should be handled by
 
 (provide 'nxml-enc)
 
-;; arch-tag: c2436247-78f3-418c-8069-85dc5335d083
 ;;; nxml-enc.el ends here