From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 23 Dec 2012 05:00:01 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=26648796c1d6c3c528ad7cdb108ecb086cfa5784;hp=26648796c1d6c3c528ad7cdb108ecb086cfa5784;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/sp/cons.py
---