Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commitb0f3a4959389b6f0e8fdb4cf84c0792aa1b95985
authorEli Zaretskii <eliz@gnu.org>
Wed, 27 May 2015 16:19:35 +0000 (27 19:19 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 27 May 2015 16:19:35 +0000 (27 19:19 +0300)
treea19cb6dbf69e2f62b500016887c9d4c1a0c24204
parent9e2f904969f9f302907a6ff9965639bd599c1d04
parentb506f8007561774479e26e8637467e8afefbe371
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs