]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorRichard Stallman <rms@gnu.org>
Sun, 5 Apr 2015 12:44:01 +0000 (08:44 -0400)
committerRichard Stallman <rms@gnu.org>
Sun, 5 Apr 2015 12:44:01 +0000 (08:44 -0400)
commit5842e489eef061766a747e26ca81e1ef6e2ece5a
treea6e85ecc7233dbc1aad578f5532e133447ee78d4
parent4e23cd0ccde4ad1e14fe2870ccf140487af649b2
parentfdc521952e6d68fa603aac899fe4c08e0a2ed480
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
lisp/ChangeLog
lisp/ChangeLog