]> code.delx.au - gnu-emacs/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 07:58:43 +0000 (09:58 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 07:58:43 +0000 (09:58 +0200)

Trivial merge