]> code.delx.au - gnu-emacs/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 18:47:01 +0000 (20:47 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 18:47:01 +0000 (20:47 +0200)

Trivial merge