Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commitda4a31b1b1af919f0473dffa86b46beec5ca5541
authorEli Zaretskii <eliz@gnu.org>
Sat, 16 May 2015 09:33:12 +0000 (16 12:33 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 16 May 2015 09:33:12 +0000 (16 12:33 +0300)
tree90abc1a14c215cd6efa3a492400a39dbd356602a
parent91a274810ff17403f37bde512716b180c9ab75ef
parenta96731d7f0f0616e500583a1d3eaa912a7f0ec16
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs