Merge branch 'v1.1'

author tierno <alfonso.tiernosepulveda@telefonica.com>

Tue, 7 Feb 2017 09:30:32 +0000 (10:30 +0100)

committer tierno <alfonso.tiernosepulveda@telefonica.com>

Tue, 7 Feb 2017 09:30:32 +0000 (10:30 +0100)
author tierno <alfonso.tiernosepulveda@telefonica.com>
Tue, 7 Feb 2017 09:30:32 +0000 (10:30 +0100)
committer tierno <alfonso.tiernosepulveda@telefonica.com>
Tue, 7 Feb 2017 09:30:32 +0000 (10:30 +0100)
diff --cc httpserver.py
Simple merge
diff --cc vimconn_openvim.py
Simple merge
author	tierno <alfonso.tiernosepulveda@telefonica.com>
	Tue, 7 Feb 2017 09:30:32 +0000 (10:30 +0100)
committer	tierno <alfonso.tiernosepulveda@telefonica.com>
	Tue, 7 Feb 2017 09:30:32 +0000 (10:30 +0100)
		1	2
httpserver.py	patch \|	diff1 \|	diff2 \|	blob \| history
vimconn_openvim.py	patch \|	diff1 \|	diff2 \|	blob \| history