Merge from emacs-24
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Jan 2013 03:43:02 +0000 (22:43 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Jan 2013 03:43:02 +0000 (22:43 -0500)
commit466db68453c7b043f57560836fcf4c0fb3aa5927
tree4cfd653dc130488bc57f26599b88c35792169239
parent0c58e8797dfef3dc4fbd100330f6ea96aa47157a
parent775cba66ce8f55b376934ac46053eb78bded83f2
Merge from emacs-24
admin/ChangeLog
doc/lispref/ChangeLog
etc/ChangeLog
lisp/ChangeLog
lisp/faces.el
lisp/simple.el