From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 23 Apr 2013 03:56:52 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=8fec8547c47c0452333972f554f328d0c8e61be2;hp=8fec8547c47c0452333972f554f328d0c8e61be2;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/__init__.py
---