Merge from origin/emacs-25

[gnu-emacs] / lisp / international / mule-conf.el

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index ecbc4f48caa961492b7ad1297c010ac24c7e6d0e..cacfc6b6e905591730f7cf4633d5207bd42222cc 100644 (file)
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1,6 +1,6 @@
 ;;; mule-conf.el --- configure multilingual environment
 
-;; Copyright (C) 1997-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2016 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021