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

Trivial merge