Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 15 Jan 2017 03:24:39 +0000 (04:24 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 15 Jan 2017 03:24:39 +0000 (04:24 +0100)
commit5afb31180662cfaf123ae6155a832470c7c6dce2
tree1219c2b57a0917150c892df96547c0200d2c93d0
parent1273171c643351d41f6d4fbf90f236432d005fc6
parent8f33b1dec22f0e1e66a0938546a3da4be1f57ae9
Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw

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