Merge branch 'master' of https://github.com/iotbzh/afb-daemon
authorFulup Ar Foll <fulup@iot.bzh>
Fri, 13 May 2016 17:10:54 +0000 (19:10 +0200)
committerFulup Ar Foll <fulup@iot.bzh>
Fri, 13 May 2016 17:10:54 +0000 (19:10 +0200)
1  2 
src/afb-hsrv.c

diff --cc src/afb-hsrv.c
Simple merge