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

Trivial merge