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

Trivial merge