Merge branch 'master' into python2

author Fredrik Tolf <fredrik@dolda2000.com>

Wed, 22 Mar 2017 04:40:43 +0000 (05:40 +0100)

committer Fredrik Tolf <fredrik@dolda2000.com>

Wed, 22 Mar 2017 04:40:43 +0000 (05:40 +0100)
author Fredrik Tolf <fredrik@dolda2000.com>
Wed, 22 Mar 2017 04:40:43 +0000 (05:40 +0100)
committer Fredrik Tolf <fredrik@dolda2000.com>
Wed, 22 Mar 2017 04:40:43 +0000 (05:40 +0100)
diff --cc wrw/proto.py
Simple merge
diff --cc wrw/req.py
Simple merge
author	Fredrik Tolf <fredrik@dolda2000.com>
	Wed, 22 Mar 2017 04:40:43 +0000 (05:40 +0100)
committer	Fredrik Tolf <fredrik@dolda2000.com>
	Wed, 22 Mar 2017 04:40:43 +0000 (05:40 +0100)
		1	2
wrw/proto.py	patch \|	diff1 \|	diff2 \|	blob \| history
wrw/req.py	patch \|	diff1 \|	diff2 \|	blob \| history