Merge branch 'master' of git:iotbzh/afb-daemon
authorFulup Ar Foll <fulup@iot.bzh>
Mon, 14 Dec 2015 14:19:12 +0000 (15:19 +0100)
committerFulup Ar Foll <fulup@iot.bzh>
Mon, 14 Dec 2015 14:19:12 +0000 (15:19 +0100)

Trivial merge