Merge branch 'develop' into form_libzakform

author Andrea Zagli <azagli@libero.it>

Sat, 26 Mar 2016 15:42:34 +0000 (16:42 +0100)

committer Andrea Zagli <azagli@libero.it>

Sat, 26 Mar 2016 15:42:34 +0000 (16:42 +0100)
author Andrea Zagli <azagli@libero.it>
Sat, 26 Mar 2016 15:42:34 +0000 (16:42 +0100)
committer Andrea Zagli <azagli@libero.it>
Sat, 26 Mar 2016 15:42:34 +0000 (16:42 +0100)
diff --cc src/url.c
Simple merge
diff --cc tests/session.c
Simple merge
author	Andrea Zagli <azagli@libero.it>
	Sat, 26 Mar 2016 15:42:34 +0000 (16:42 +0100)
committer	Andrea Zagli <azagli@libero.it>
	Sat, 26 Mar 2016 15:42:34 +0000 (16:42 +0100)
		1	2
src/url.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/session.c	patch \|	diff1 \|	diff2 \|	blob \| history