From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 15 Jan 2017 03:24:39 +0000 (+0100)
Subject: Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=5afb31180662cfaf123ae6155a832470c7c6dce2;hp=5afb31180662cfaf123ae6155a832470c7c6dce2

Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw

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