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

Merge branch 'master' into python3

Conflicts:
	wrw/wmako.py
---

5d0ae1011cdaf805d3d4b7cefb204f70dfd03689
diff --cc wrw/wmako.py
index 4261938,13ce342..ef886fb
--- a/wrw/wmako.py
+++ b/wrw/wmako.py
@@@ -1,6 -1,6 +1,6 @@@
  import os, threading
  from mako import template, lookup, filters
- from . import util, form, session, env
 -import util, form, session, env, resp
++from . import util, form, session, env, resp
  
  # It seems Mako isn't thread-safe.
  makolock = threading.Lock()