Merge emacs-25 into master (using imerge)

[gnu-emacs] / lisp / dynamic-setting.el

diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index e967ddce3325fc56a6289fee5836499f6eeda9ce..40ef8477c534cb5112273224b709b78913d183aa 100644 (file)
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -1,9 +1,9 @@
 ;;; dynamic-setting.el --- Support dynamic changes
 
-;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: font, system-font, tool-bar-style
 ;; Package: emacs