Merge branch 'master' into jython
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 19 Dec 2012 05:24:35 +0000 (06:24 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 19 Dec 2012 05:24:35 +0000 (06:24 +0100)
commit809f0edc1d621010d0cf62ced892f13ee24fde8e
treeea45a8e97d790f7b06fb83b89228db02b873655b
parentc7cc3ff342419755855aa93f165920d4f0107aac
parent381b2eefcd81c8b717df62bad056c326d61b4b52
Merge branch 'master' into jython

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