]> git.eshelyaron.com Git - emacs.git/commitdiff
merge master
authorJoakim Verona <joakim@verona.se>
Mon, 26 Jan 2015 20:57:51 +0000 (21:57 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Jan 2015 20:57:51 +0000 (21:57 +0100)

Trivial merge