Merge origin/master
authorFulup Ar Foll <fulup@iot.bzh>
Wed, 17 Feb 2016 13:41:07 +0000 (14:41 +0100)
committerFulup Ar Foll <fulup@iot.bzh>
Wed, 17 Feb 2016 13:41:07 +0000 (14:41 +0100)
commit3da6e9fad4c6788098cf425369fb3d7860cb824f
tree95751052d331a35162c242a4c2d2f177a9b7ada0
parent6d0846d769256e74a3f403fc0e5965e2d227b324
parentfcfb3c0951b6e2e06e7bf282e867576d8abb00c4
Merge origin/master
src/rest-api.c
src/session.c