]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 21:46:30 +0000 (23:46 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 21:46:30 +0000 (23:46 +0200)

Trivial merge