From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 21 Dec 2011 07:16:56 +0000 (+0100)
Subject: Merge branch 'master' into python2
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=a4ad119b9bb8ba705deb818c08f99927a6ac5cd3;hp=a4ad119b9bb8ba705deb818c08f99927a6ac5cd3;p=wrw.git

Merge branch 'master' into python2

Conflicts:
	wrw/__init__.py
---