]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 19:56:47 +0000 (21:56 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 21 Aug 2013 19:56:47 +0000 (21:56 +0200)

Trivial merge