Merge branch 'master' of github.com:iotbzh/afb-daemon
authorFulup Ar Foll <fulup@iot.bzh>
Tue, 26 Jan 2016 12:06:55 +0000 (13:06 +0100)
committerFulup Ar Foll <fulup@iot.bzh>
Tue, 26 Jan 2016 12:06:55 +0000 (13:06 +0100)

Trivial merge