Merge branch 'master' of moltke.seatribe.se:/usr/local/src/wrw
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 22 Mar 2017 04:40:21 +0000 (05:40 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 22 Mar 2017 04:40:21 +0000 (05:40 +0100)

Trivial merge