Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commit54109758ff69bd45a8adb7a18583153fc78bd5ca
authorEli Zaretskii <eliz@gnu.org>
Sat, 30 May 2015 12:02:51 +0000 (30 15:02 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 May 2015 12:02:51 +0000 (30 15:02 +0300)
treeac34a4852898e27566647cf8d6ac2c18ec203da1
parent0acb538bb058aa2b961ab183d7473cdf4a820a79
parent0ac9d09b6dfe47918abe5020a9d7dbc3a625dbac
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs