]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' into comment-cache
authorAlan Mackenzie <acm@muc.de>
Thu, 10 Mar 2016 16:21:47 +0000 (16:21 +0000)
committerAlan Mackenzie <acm@muc.de>
Thu, 10 Mar 2016 16:21:47 +0000 (16:21 +0000)

Trivial merge