Merge branch 'master' of github.com:iotbzh/afb-daemon
authorJosé Bollo <jose.bollo@iot.bzh>
Tue, 5 Apr 2016 17:32:47 +0000 (19:32 +0200)
committerJosé Bollo <jose.bollo@iot.bzh>
Tue, 5 Apr 2016 17:32:47 +0000 (19:32 +0200)

Trivial merge