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

Trivial merge