]> git.eshelyaron.com Git - emacs.git/commitdiff
merge master
authorJoakim Verona <joakim@verona.se>
Fri, 11 Dec 2015 09:38:19 +0000 (10:38 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 11 Dec 2015 09:38:19 +0000 (10:38 +0100)

Trivial merge