Merge branch 'master' of https://github.com/iotbzh/afb-daemon
authorFulup Ar Foll <fulup@iot.bzh>
Sat, 28 May 2016 09:55:08 +0000 (11:55 +0200)
committerFulup Ar Foll <fulup@iot.bzh>
Sat, 28 May 2016 09:55:08 +0000 (11:55 +0200)

Trivial merge