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

Trivial merge