]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 07:22:12 +0000 (09:22 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 07:22:12 +0000 (09:22 +0200)

Trivial merge