From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 13 May 2012 03:43:33 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=7bcaef26c590cd10955848fbf313f41c78b8d1ce;hp=7bcaef26c590cd10955848fbf313f41c78b8d1ce;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/resp.py
---