]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 17:42:36 +0000 (19:42 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 17:42:36 +0000 (19:42 +0200)

Trivial merge