]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Wed, 26 Dec 2012 11:26:14 +0000 (12:26 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 26 Dec 2012 11:26:14 +0000 (12:26 +0100)

Trivial merge