]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Thu, 13 Nov 2014 15:29:20 +0000 (16:29 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Thu, 13 Nov 2014 15:29:20 +0000 (16:29 +0100)
commitd856e6b0d87fed67001e83fcfccba9c932af3487
treea4bf9bbfeedc89d0d7ed5240910cc890445ce4ca
parenta85cf0d9fe03713cfae31415208cbd49d3227ae1
parent38fa4bcbd238a0628ca51c5cd656211a0ef62eef
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
lisp/ChangeLog
lisp/ChangeLog