Merge moltke.seatribe.se:/usr/local/src/wrw
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 9 May 2014 06:14:51 +0000 (08:14 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 9 May 2014 06:14:51 +0000 (08:14 +0200)

Trivial merge