Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 28 Dec 2011 00:46:22 +0000 (01:46 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 28 Dec 2011 00:46:22 +0000 (01:46 +0100)
Conflicts:
wrw/util.py


No differences found