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

Trivial merge