]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 18:22:04 +0000 (20:22 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 18:22:04 +0000 (20:22 +0200)

Trivial merge