From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 1 Jan 2012 21:42:41 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://www.dolda2000.com/gitweb/?a=commitdiff_plain;h=f593b3dbae242213fa6ea3e1b11310fe15d6ddad;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/session.py
---

f593b3dbae242213fa6ea3e1b11310fe15d6ddad