Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commitb0f4acfcb739358d98e3e4d78263467edb53e968
authorMichael Albinus <michael.albinus@gmx.de>
Wed, 16 Sep 2015 13:51:01 +0000 (16 15:51 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Wed, 16 Sep 2015 13:51:01 +0000 (16 15:51 +0200)
tree6479a1f60bfdd21906a317a94a8d7789abd62053
parentc762d3305cbd429606ef9f51f62b9bb3f36d00f2
parent23274eaf02f371bed49eba2eee9fde90ff3d6672
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs