]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 230c010 09ab6fe)
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)
Conflicts:
lisp/ChangeLog


Trivial merge