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

Trivial merge