]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 13:51:01 +0000 (14:51 +0100)
committerJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 13:51:01 +0000 (14:51 +0100)

Trivial merge