Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commitf66d4e860ef45719628e3c2bab336f62fff38db2
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 30 Jun 2015 03:47:18 +0000 (30 03:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 30 Jun 2015 03:47:18 +0000 (30 03:47 +0000)
tree2c568dcdb96adc1d69410d88c23a543b012f1ef7
parent3fa319bd841dfd0451fcd0e937af9582bdb81ef7
parent1b3004cbf4de52261977d32a33b9a7e1ee630647
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs