Merge from mainline.

[gnu-emacs] / lisp / json.el

diff --git a/lisp/json.el b/lisp/json.el
index e389907414943d8d723afb6252d53587dd98af72..47448f4702af940f395ee229b1104f93aa3d8c2f 100644 (file)
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -1,6 +1,6 @@
 ;;; json.el --- JavaScript Object Notation parser / generator
 
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
 ;; Author: Edward O'Connor <ted@oconnor.cx>
 ;; Version: 1.2
@@ -526,5 +526,4 @@ Advances point just past JSON object."
 
 (provide 'json)
 
-;; arch-tag: 15f6e4c8-b831-4172-8749-bbc680c50ea1
 ;;; json.el ends here