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

Trivial merge