]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 11:16:55 +0000 (13:16 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 11:16:55 +0000 (13:16 +0200)

Trivial merge