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

Trivial merge