Merge branch 'python3' of git.dolda2000.com:/srv/git/r/wrw into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Dec 2013 09:53:03 +0000 (10:53 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Dec 2013 09:53:03 +0000 (10:53 +0100)

Trivial merge