From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 23 Apr 2013 03:56:52 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=8fec8547c47c0452333972f554f328d0c8e61be2;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/__init__.py
---

8fec8547c47c0452333972f554f328d0c8e61be2
diff --cc wrw/__init__.py
index acf7f64,95ff4cd..eb4a0a0
--- a/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