Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Fri, 26 Jun 2015 10:04:28 +0000 (13:04 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 26 Jun 2015 10:04:28 +0000 (13:04 +0300)

Trivial merge