Merge origin/master
authorFulup Ar Foll <fulup@iot.bzh>
Tue, 22 Dec 2015 14:53:29 +0000 (15:53 +0100)
committerFulup Ar Foll <fulup@iot.bzh>
Tue, 22 Dec 2015 14:53:29 +0000 (15:53 +0100)
commit39a0ef5d1609e01f71039f9095c14cf6f3ca1a93
tree07b7a482e3948010d6d78e956225226e79c96eb3
parenteee04b4ac5847f6101b9321e4513c4401e745a0a
parent6f2913ab5e366e8f3df12a7df11a85b7b6574e2c
Merge origin/master