Merge from emacs-24
commiteed18bf1fd1162872e196091ab795a773f277e8e
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 21 Oct 2014 01:17:06 +0000 (20 21:17 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 21 Oct 2014 01:17:06 +0000 (20 21:17 -0400)
treef3fee81f1e7fdf23b57138740437e07ce244ede8
parent8a85c254de2528be0f3ff154fa24df65e6557c1a
parent1fc82d89a8a603754d17a35be1ce78e66d0b6fd6
Merge from emacs-24
15 files changed:
admin/ChangeLog
doc/emacs/ChangeLog
doc/lispintro/ChangeLog
doc/misc/ChangeLog
etc/ChangeLog
lib-src/ChangeLog
lisp/ChangeLog
lisp/cedet/ChangeLog
lisp/gnus/ChangeLog
lisp/mh-e/ChangeLog
lisp/org/ChangeLog
lisp/url/ChangeLog
oldXMenu/ChangeLog
src/ChangeLog
src/xdisp.c