Merge branch 'master' into python3

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

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

diff --cc wrw/util.py
index 1c2ed6fc9525cbb461101edae20b30f11b151638,7a29ea8c20571bf0543a17af9f0e57be5554ddeb..35cd3ae2d75fd2d2524c6f2693fd6e472a70c82d
--- 1/wrw/util.py
--- 2/wrw/util.py
+++ b/wrw/util.py
@@@ -1,4 -1,5 +1,5 @@@
- from . import req, dispatch, session
+ import inspect
 -import req, dispatch, session, form
++from . import req, dispatch, session, form
  
  def wsgiwrap(callable):
      def wrapper(env, startreq):