From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 14 Mar 2012 20:34:22 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=8b7cf2787e8cf2ee716c709d904f66c651cfed89;hp=8b7cf2787e8cf2ee716c709d904f66c651cfed89;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/__init__.py
---