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

Trivial merge