Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commit4822b56598f91489e050fcbf305d99b5e57b6791
authorEli Zaretskii <eliz@gnu.org>
Sat, 24 Sep 2016 09:36:43 +0000 (24 12:36 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 24 Sep 2016 09:36:43 +0000 (24 12:36 +0300)
tree2854d047017c083e098dce74a8e9786f37230afc
parent23efc43d01462ff0e952dd149d26e90cbe8792f0
parentb3e1b382456b0f7d108c57d6f902bbddfdd97b2a
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs