Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org
authorGlenn Morris <rgm@gnu.org>
Sat, 20 Apr 2013 19:11:25 +0000 (12:11 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 20 Apr 2013 19:11:25 +0000 (12:11 -0700)
commit61655fd96ce959e47ad8d047387e5585843fc789
treec398e5a4c21a169c0d6490b4044b37c7a4cbcae9
parentd7f5c16f47faa5764ae83a175e765066f55176f0
parent8c1f2bb0fa5eec3f052f81082ccde733e337eb40
Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org
doc/man/ChangeLog
doc/man/emacs.1