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

Trivial merge