Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 6 Apr 2013 16:07:15 +0000 (18:07 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 6 Apr 2013 16:08:26 +0000 (18:08 +0200)
Conflicts:
wrw/util.py


No differences found