]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorAlan Mackenzie <acm@muc.de>
Mon, 15 Dec 2014 12:07:18 +0000 (12:07 +0000)
committerAlan Mackenzie <acm@muc.de>
Mon, 15 Dec 2014 12:07:18 +0000 (12:07 +0000)

Trivial merge