From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 28 Dec 2011 00:46:22 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=d13a1a574515e4c4a40ed0090c8c684cc9e523f2;hp=d13a1a574515e4c4a40ed0090c8c684cc9e523f2;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/util.py
---