Merge changes from emacs-23 branch.

[gnu-emacs] / doc / man / ChangeLog

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 16e612089552c793d788f099ccefac8d7f5e114c..f2810be7f97eb07772880530b1798cec737114f5 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-12  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.1: Small fixes.
+
+2010-10-12  Ulrich Mueller  <ulm@gentoo.org>
+
+       * emacs.1: Update license description.
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
        * b2m.1: Remove file.