Merge origin/master

author Fulup Ar Foll <fulup@iot.bzh>

Wed, 17 Feb 2016 13:41:07 +0000 (14:41 +0100)

committer Fulup Ar Foll <fulup@iot.bzh>

Wed, 17 Feb 2016 13:41:07 +0000 (14:41 +0100)
author Fulup Ar Foll <fulup@iot.bzh>
Wed, 17 Feb 2016 13:41:07 +0000 (14:41 +0100)
committer Fulup Ar Foll <fulup@iot.bzh>
Wed, 17 Feb 2016 13:41:07 +0000 (14:41 +0100)
diff --cc src/rest-api.c
Simple merge
diff --cc src/session.c
Simple merge
author	Fulup Ar Foll <fulup@iot.bzh>
	Wed, 17 Feb 2016 13:41:07 +0000 (14:41 +0100)
committer	Fulup Ar Foll <fulup@iot.bzh>
	Wed, 17 Feb 2016 13:41:07 +0000 (14:41 +0100)
		1	2
src/rest-api.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/session.c	patch \|	diff1 \|	diff2 \|	blob \| history