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/?a=commitdiff_plain;h=ad5b93034c1c28f0f4deab4c1b62cb2d6a869f81;hp=ad5b93034c1c28f0f4deab4c1b62cb2d6a869f81;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/wmako.py
---