Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 30 Dec 2011 01:34:20 +0000 (02:34 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 30 Dec 2011 01:34:20 +0000 (02:34 +0100)
commitca6fd155fd1cf58241c9d136977c2fd08948b51b
tree4d0dd80bb51682914b4ac1271695635de4d184de
parent61f96448641cf83a95fdc557c323e7009ba55cd8
parentbbdebbab6c98d8611bc8faa197df226d29e4cb2b
Merge branch 'master' into python3

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