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

Trivial merge