From: Glenn Morris <rgm@gnu.org>
Date: Sat, 20 Apr 2013 19:11:25 +0000 (-0700)
Subject: Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~415
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61655fd96ce959e47ad8d047387e5585843fc789;p=emacs.git

Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org
---

61655fd96ce959e47ad8d047387e5585843fc789
diff --cc doc/man/ChangeLog
index 8a2a90f7895,1898160220b..8b550dc4417
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@@ -1,6 -1,10 +1,10 @@@
 -2013-04-10  Petr Hracek  <phracek@redhat.com>  (tiny change)
++2013-04-20  Petr Hracek  <phracek@redhat.com>  (tiny change)
+ 
+ 	* emacs.1: Add some more command-line options.  (Bug#14165)
+ 
 -2013-03-11  Glenn Morris  <rgm@gnu.org>
 +2012-12-02  Kevin Ryde  <user42@zip.com.au>
  
 -	* Version 24.3 released.
 +	* etags.1: Mention effect of --declarations in Lisp.
  
  2012-06-03  Glenn Morris  <rgm@gnu.org>