Merge from origin/emacs-25

[gnu-emacs] / lisp / json.el

diff --git a/lisp/json.el b/lisp/json.el
index 85827b5d9bf2c8dcfaceda5b7665139010b82db1..bd1ee5316567d6d4d1bb5133e269eba8799705ba 100644 (file)
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -1,6 +1,6 @@
 ;;; json.el --- JavaScript Object Notation parser / generator
 
-;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2016 Free Software Foundation, Inc.
 
 ;; Author: Edward O'Connor <ted@oconnor.cx>
 ;; Version: 1.4