Merge changes from emacs-23 branch

[gnu-emacs] / doc / man / ChangeLog

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index f2810be7f97eb07772880530b1798cec737114f5..55e38e33a0a6a3bbd33ab1468fd33c40fa79d272 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-02  Jari Aalto  <jari.aalto@cante.net>  (tiny change)
+
+       * emacsclient.1: Arrange options alphabetically (Bug#7620).
+
 2010-10-12  Glenn Morris  <rgm@gnu.org>
 
        * emacs.1: Small fixes.