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://dolda2000.com/gitweb/?a=commitdiff_plain;h=5d0ae1011cdaf805d3d4b7cefb204f70dfd03689;hp=5d0ae1011cdaf805d3d4b7cefb204f70dfd03689;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/wmako.py
---