Merge branch 'master' into python2
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 21 Dec 2011 07:16:56 +0000 (08:16 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 21 Dec 2011 07:16:56 +0000 (08:16 +0100)
commita4ad119b9bb8ba705deb818c08f99927a6ac5cd3
treea204298d172520be1f6002d7717537346e7075df
parent9aebe126b0e64eca0a987a9fcc652d8df4476f6a
parentd1f70c6c18e44a82ded765f4d53668ea3e5d34a1
Merge branch 'master' into python2

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