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)
commitd13a1a574515e4c4a40ed0090c8c684cc9e523f2
treeabc858524a7741b3ae5fc1f39768b764eac1992d
parenta4ad119b9bb8ba705deb818c08f99927a6ac5cd3
parent3b9bc7005f761c955dd8664c8141cc338f35ac91
Merge branch 'master' into python3

Conflicts:
wrw/util.py
wrw/util.py