From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 5 Aug 2012 05:44:44 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=920b69c320cb0dc83eec0c8b4397c7a5b80b7d5b;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/cookie.py
---

920b69c320cb0dc83eec0c8b4397c7a5b80b7d5b
diff --cc wrw/cookie.py
index 3a3c916,4f5071a..b66e293
--- a/wrw/cookie.py
+++ b/wrw/cookie.py
@@@ -1,4 -1,5 +1,5 @@@
- import http.cookies
 -import Cookie, time
 -import proto
++import http.cookies, time
++from . import proto
  
  __all__ = ["cookies", "get", "add"]