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

Trivial merge