Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 6 Feb 2012 06:43:25 +0000 (07:43 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 6 Feb 2012 06:43:25 +0000 (07:43 +0100)

Trivial merge