Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commit40e720d049693dfe0c5559a8a8285a0b5cc6c5e2
authorK. Handa <handa@gnu.org>
Sat, 2 May 2015 13:39:54 +0000 (2 22:39 +0900)
committerK. Handa <handa@gnu.org>
Sat, 2 May 2015 13:39:54 +0000 (2 22:39 +0900)
tree46b84f79be0930e7fa729ae06836b90892e3d9b5
parentc3c9dab41b637b53034dd2f3dce6bf042380adae
parent0bbc027356b680f32ac7b2d47d43a65d01091032
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs