]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 18 Jan 2013 23:03:30 +0000 (00:03 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 18 Jan 2013 23:03:30 +0000 (00:03 +0100)

Trivial merge