]> code.delx.au - gnu-emacs/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Sun, 11 Jan 2015 15:00:33 +0000 (16:00 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sun, 11 Jan 2015 15:00:33 +0000 (16:00 +0100)
commita3eebe9bbd78b16557b003a75f42bf1225c90414
treeae993ba7b13e06a2c49aea9c4603d13c6377c1aa
parent38bb639d552524f9d7311a99536d7b353aa2f029
parent4113ac253456027c4b54b92a617e0c2b3003a049
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
lisp/ChangeLog
lisp/ChangeLog