]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 06:46:48 +0000 (08:46 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 06:46:48 +0000 (08:46 +0200)

Trivial merge