From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 5 Jul 2012 03:19:40 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=ad5b93034c1c28f0f4deab4c1b62cb2d6a869f81

Merge branch 'master' into python3

Conflicts:
	wrw/wmako.py
---

ad5b93034c1c28f0f4deab4c1b62cb2d6a869f81
diff --cc wrw/wmako.py
index 817233d,491d8b3..4261938
--- 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
 -import util, form, session, env
++from . import util, form, session, env
  
  # It seems Mako isn't thread-safe.
  makolock = threading.Lock()