Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commit0868bad993c725397d2034fdc8ab1c77ad8b03a0
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 Nov 2014 22:12:32 +0000 (13 22:12 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 Nov 2014 22:12:32 +0000 (13 22:12 +0000)
tree1a14c094819787f1ec6475f0f547ab3d3048a813
parent4af97e67819831ca0b92600232aae8e99aeb0592
parent14b1c9d82d450431e42a76ce2f797ed57c50c8dc
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs