]> code.delx.au - gnu-emacs/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 17:40:40 +0000 (19:40 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 17:40:40 +0000 (19:40 +0200)

Trivial merge