]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 14:07:59 +0000 (16:07 +0200)
committerJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 14:07:59 +0000 (16:07 +0200)

Trivial merge