Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commit2dacd0a7eee1f8fdff028e15ff40640d005c71d7
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 10 Feb 2015 07:55:14 +0000 (10 07:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 10 Feb 2015 07:55:14 +0000 (10 07:55 +0000)
treebd17dba88215113e7564f7ab044272f0a9be4d81
parentb88908b6f0775e4275fdad2c80ea0199d277a947
parentf6d781c29456590dfb10e1710171e8d983eeb9e2
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs