]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Thu, 27 Dec 2012 20:07:34 +0000 (21:07 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 27 Dec 2012 20:07:34 +0000 (21:07 +0100)

Trivial merge