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)
commit3f9549e874035d963eb5ca02f24d51dc935e6326
tree1340657aa0689287b52f3dba9d8c6bc4da822c02
parentb14abca9476cba2f500b5eda89441d593dd0f12b
parentc4dd9efc9ed3f7de8f4ee74b6d47f65ad72320cf
Merge from emacs-24
admin/ChangeLog
doc/lispref/ChangeLog
etc/ChangeLog
lisp/ChangeLog
lisp/faces.el
lisp/simple.el