Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commit816c1dfc5dfc6d490c653b393ef6876b3f04b7fe
authorAlan Mackenzie <acm@muc.de>
Mon, 15 Dec 2014 12:07:18 +0000 (15 12:07 +0000)
committerAlan Mackenzie <acm@muc.de>
Mon, 15 Dec 2014 12:07:18 +0000 (15 12:07 +0000)
tree8a1e18c725f6cb07a97f85769322e6089af4580c
parent436b88bf9960c97f4588d8e3d9c0c353e7898792
parente2815bfe2a1e4d5a21d6b6378ebc2108d4d104ab
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs