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

Trivial merge