Merge branch 'develop' into form_libzakform

author Andrea Zagli <azagli@libero.it>

Sat, 13 Feb 2016 08:57:09 +0000 (09:57 +0100)

committer Andrea Zagli <azagli@libero.it>

Sat, 13 Feb 2016 08:57:09 +0000 (09:57 +0100)
author Andrea Zagli <azagli@libero.it>
Sat, 13 Feb 2016 08:57:09 +0000 (09:57 +0100)
committer Andrea Zagli <azagli@libero.it>
Sat, 13 Feb 2016 08:57:09 +0000 (09:57 +0100)
diff --cc src/main.c
Simple merge
diff --cc src/main.h
Simple merge
author	Andrea Zagli <azagli@libero.it>
	Sat, 13 Feb 2016 08:57:09 +0000 (09:57 +0100)
committer	Andrea Zagli <azagli@libero.it>
	Sat, 13 Feb 2016 08:57:09 +0000 (09:57 +0100)
		1	2
src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.h	patch \|	diff1 \|	diff2 \|	blob \| history