From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 16 Jan 2013 00:17:51 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=10ba659d32518d2d09b12ada86a380798b378fe7;hp=10ba659d32518d2d09b12ada86a380798b378fe7;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/dispatch.py
---