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

Trivial merge