]> git.eshelyaron.com Git - emacs.git/commitdiff
upstream
authorJoakim Verona <joakim@verona.se>
Wed, 17 Apr 2013 19:56:43 +0000 (21:56 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 17 Apr 2013 19:56:43 +0000 (21:56 +0200)

Trivial merge