]> git.eshelyaron.com Git - emacs.git/commitdiff
merge upstream
authorJoakim Verona <joakim@verona.se>
Wed, 12 Jun 2013 21:08:43 +0000 (23:08 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 12 Jun 2013 21:08:43 +0000 (23:08 +0200)

Trivial merge