Merge from origin/emacs-24

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6cc59c47d060bc4a1cd2041af005c397c301c6b7..092bfa9ad59dd710aa49bf1a3c4ddc978276940c 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,4 +1,13 @@
-2015-01-03  Glenn Morris  <rgm@gnu.org>
+2015-03-03  Kelvin White  <kwhite@gnu.org>
+
+       * MAINTAINERS: Add myself to section 2
+
+2015-03-03  Glenn Morris  <rgm@gnu.org>
+
+       * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address
+       rather than webmasters@gnu.
+
+2015-01-28  Glenn Morris  <rgm@gnu.org>
 
        * update_autogen (commit): Prepend "# " to commit message.