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

Trivial merge