]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 14 Aug 2013 13:57:34 +0000 (15:57 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 14 Aug 2013 13:57:34 +0000 (15:57 +0200)

Trivial merge