From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 12 Jan 2012 00:05:15 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=f9e9a7b5b192adfc7318e7f3ba0153668eef3bc1;hp=-c;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/resp.py
---

f9e9a7b5b192adfc7318e7f3ba0153668eef3bc1