]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 14 Dec 2012 09:12:07 +0000 (10:12 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 14 Dec 2012 09:12:07 +0000 (10:12 +0100)

Trivial merge