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

Trivial merge