]> code.delx.au - gnu-emacs/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Tue, 20 Aug 2013 10:16:47 +0000 (12:16 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 20 Aug 2013 10:16:47 +0000 (12:16 +0200)

Trivial merge