Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 5 Apr 2016 21:30:44 +0000 (23:30 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 5 Apr 2016 21:30:44 +0000 (23:30 +0200)

Trivial merge