Merge origin/master
authorFulup Ar Foll <fulup@iot.bzh>
Tue, 22 Dec 2015 16:55:35 +0000 (17:55 +0100)
committerFulup Ar Foll <fulup@iot.bzh>
Tue, 22 Dec 2015 16:55:35 +0000 (17:55 +0100)
1  2 
src/rest-api.c

diff --cc src/rest-api.c
Simple merge