Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 23 Apr 2013 03:56:52 +0000 (05:56 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 23 Apr 2013 03:56:52 +0000 (05:56 +0200)
commit8fec8547c47c0452333972f554f328d0c8e61be2
tree3d224a53c2eada9ecce52819ec89320a7fc6b4ac
parentcc1126892c7148faadc7b6781acce6a4a99ede5c
parent525d7938bc668f6079f0fd00a0baad75b1aebe24
Merge branch 'master' into python3

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