Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 8 Nov 2015 02:53:18 +0000 (03:53 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 8 Nov 2015 02:53:18 +0000 (03:53 +0100)

Trivial merge