]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 7 Dec 2012 16:42:13 +0000 (17:42 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 7 Dec 2012 16:42:13 +0000 (17:42 +0100)

Trivial merge