]> 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:48:49 +0000 (12:48 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Fri, 19 Dec 2014 11:48:49 +0000 (12:48 +0100)
commit09ab6fedb2314ad1f6ef1cac8643e4b75d4798a2
tree60845d08beff4c498039c624029e1e135acfc161
parent2616307f5c517124715b4d20bdd23c6c70366ac9
parenta864bfb57c8445156dbe7e30b0348d9896c27b28
Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24

Conflicts:
lisp/ChangeLog