Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se
authorGlenn Morris <rgm@gnu.org>
Wed, 14 May 2014 17:01:29 +0000 (10:01 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 14 May 2014 17:01:29 +0000 (10:01 -0700)
commitf4da4720dfdefbdace402201c6a5fc8017bb98aa
treeff0ad3d49398cca6c22b9061742d95fc1b0a9eae
parent6f1d9822d972c418dbf2295fcd01b7b0a3dc5ef8
parent34cba8e885f2ed1c0e9c805ad89b9464e0b5766a
Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se
doc/emacs/ChangeLog
lisp/ChangeLog
lisp/minibuffer.el