Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commit1c671d650ce8da0b09494fb43987c9449331ed63
authorEli Zaretskii <eliz@gnu.org>
Fri, 21 Aug 2015 13:33:46 +0000 (21 16:33 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 21 Aug 2015 13:33:46 +0000 (21 16:33 +0300)
treedbbbf394eed98c19133d68217f4b840f8905580a
parentc1402c58710c62b07aaa1e6cdee34ff20dfd4e8a
parent1a38259bbc5aea962a295e49c4d79f89ddeda709
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs