Merge from emacs-24; up to 2012-12-23T17:06:58Z!eliz@gnu.org
authorGlenn Morris <rgm@gnu.org>
Sat, 2 Mar 2013 20:10:05 +0000 (12:10 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 2 Mar 2013 20:10:05 +0000 (12:10 -0800)
commit06b583dec7cbde714c8fb991a1e123f612b66e3a
treeafd7b125be231e2c4234f32220f84bdd4e25b50e
parent81c23309e40ca529714e765b4534d6a1f4634887
parentb270d11649521531b4b51df937149b463b8d61a8
Merge from emacs-24; up to 2012-12-23T17:06:58Z!eliz@gnu.org
etc/NEWS
src/ChangeLog
src/lisp.h