Merge branch 'master' into python3

Conflicts:
	wrw/__init__.py

diff --git a/wrw/__init__.py b/wrw/__init__.py
index f5a4e91..acf7f64 100644 (file)
--- a/wrw/__init__.py
+++ b/wrw/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ["wsgiwrap", "restart", "cookie", "formdata"]
 
 from . import proto
-from .util import wsgiwrap, stringwrap, formparams, persession, sessiondata, autodirty, manudirty
+from .util import wsgiwrap, stringwrap, formparams, persession, sessiondata, autodirty, manudirty, specdirty
 from .dispatch import restart
 from . import cookie
 from .form import formdata