]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24
authorMichael Albinus <michael.albinus@gmx.de>
Fri, 19 Dec 2014 11:56:52 +0000 (12:56 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Fri, 19 Dec 2014 11:56:52 +0000 (12:56 +0100)
commit48a9d9fdbbe8946ae29393ee8bc24c6f6619003c
tree74dafa75262593d7cd7cb87ca7ee8574a5804319
parent230c010050f424cee81c3bcf00b0f00a65819dcb
parent09ab6fedb2314ad1f6ef1cac8643e4b75d4798a2
Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24

Conflicts:
lisp/ChangeLog