From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 29 Jun 2012 02:35:17 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=6dfbe755cbc3ca1e6af3842d49fb8c6adad4e6c5;hp=6dfbe755cbc3ca1e6af3842d49fb8c6adad4e6c5;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/__init__.py
---