]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Sun, 23 Dec 2012 12:41:09 +0000 (13:41 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 23 Dec 2012 12:41:09 +0000 (13:41 +0100)

Trivial merge