]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Mon, 19 Aug 2013 16:38:33 +0000 (18:38 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 19 Aug 2013 16:38:33 +0000 (18:38 +0200)

Trivial merge