From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 19 Dec 2012 05:23:29 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=a02127330452ddc72406bb1e2e3eeadefe773ebb;hp=a02127330452ddc72406bb1e2e3eeadefe773ebb;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/req.py
---