From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 19 Sep 2013 01:21:32 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=784495582d53f5b759dd216ddd1268fbe2479bb9;hp=784495582d53f5b759dd216ddd1268fbe2479bb9;p=wrw.git

Merge branch 'master' into python3

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