Merge branch 'master' into python3

Conflicts:
	wrw/__init__.py

diff --cc wrw/__init__.py
index acf7f64,95ff4cd..eb4a0a0
--- 1/wrw/__init__.py
--- 2/wrw/__init__.py
+++ b/wrw/__init__.py
@@@ -1,7 -1,7 +1,7 @@@
  __all__ = ["wsgiwrap", "restart", "cookie", "formdata"]
  
 -import proto
 -from util import wsgiwrap, formparams, funplex, persession, sessiondata, autodirty, manudirty, specdirty
 -from dispatch import restart
 -import cookie
 -from form import formdata
 +from . import proto
- from .util import wsgiwrap, stringwrap, formparams, persession, sessiondata, autodirty, manudirty, specdirty
++from .util import wsgiwrap, stringwrap, formparams, funplex, persession, sessiondata, autodirty, manudirty, specdirty
 +from .dispatch import restart
 +from . import cookie
 +from .form import formdata

diff --cc wrw/util.py
Simple merge