From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 3 Apr 2014 04:03:53 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=425ebacf6c53fa475ad0e8c7aea62d19617d4aea;hp=425ebacf6c53fa475ad0e8c7aea62d19617d4aea;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/session.py
---