Merge branch 'master' into python2
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 19 Mar 2017 20:00:54 +0000 (21:00 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 19 Mar 2017 20:00:54 +0000 (21:00 +0100)
commite216962e64bbfd0377511f456edc40570f8efb46
tree6ad3243355a9e6168f7b0ec4b24e7c5a27b5200f
parentb6f62b898efdc272130d3dbdd6742c5b785e7c7d
parent328e9684d09e1f415622ba3d7bc7fc446f54e1a1
Merge branch 'master' into python2

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