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

Trivial merge