]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 02:45:50 +0000 (04:45 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 02:45:50 +0000 (04:45 +0200)

Trivial merge