Merge branch 'master' into python3

Conflicts:
	wrw/__init__.py

diff --cc wrw/__init__.py
index d4b0a63,8df1a36..6458f64
--- 1/wrw/__init__.py
--- 2/wrw/__init__.py
+++ b/wrw/__init__.py
@@@ -1,6 -1,7 +1,7 @@@
  __all__ = ["wsgiwrap", "restart", "cookie", "formdata"]
  
 -import proto
 -from util import wsgiwrap, formparams, persession, sessiondata, autodirty, manudirty
 -from dispatch import restart
 -import cookie
 -from form import formdata
++from . import proto
 +from .util import wsgiwrap, formparams, persession, sessiondata, autodirty, manudirty
 +from .dispatch import restart
 +from . import cookie
 +from .form import formdata

diff --cc wrw/form.py
index dd1d5e9,1f0e530..d089fd7
--- 1/wrw/form.py
--- 2/wrw/form.py
+++ b/wrw/form.py
@@@ -1,4 -1,5 +1,5 @@@
  import cgi
 -import proto
++from . import proto
  
  __all__ = ["formdata"]
  

diff --cc wrw/req.py
Simple merge