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

Trivial merge