Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 19 Dec 2012 05:23:29 +0000 (06:23 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 19 Dec 2012 05:23:29 +0000 (06:23 +0100)
commita02127330452ddc72406bb1e2e3eeadefe773ebb
tree05516da893944e9ce6c754f76e90c7bd9c51f7e2
parentb904defe1135d64ae7035b8903c221b0f022b98f
parent381b2eefcd81c8b717df62bad056c326d61b4b52
Merge branch 'master' into python3

Conflicts:
wrw/req.py
wrw/req.py