]> code.delx.au - gnu-emacs/commitdiff
merge master
authorJoakim Verona <joakim@verona.se>
Sun, 18 Jan 2015 09:53:38 +0000 (10:53 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 18 Jan 2015 09:53:38 +0000 (10:53 +0100)

Trivial merge