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

Trivial merge