Merge branch 'master'
authorJosé Bollo <jose.bollo@iot.bzh>
Thu, 12 May 2016 09:27:39 +0000 (11:27 +0200)
committerJosé Bollo <jose.bollo@iot.bzh>
Thu, 12 May 2016 09:27:39 +0000 (11:27 +0200)
commited54e8410771ee5f13c76f968086c6aa098a750d
tree21998650e952a017f5041716c943b1c499123489
parent95b6dc2f61f447783c65f98e2e1e2dda16249073
parent04c2e56502996e87a573499fdc916ff74895a2f1
Merge branch 'master'

er en quoi cette fusion est

Change-Id: I988c9cf042b120935b2c7ff2c6d9a5d969ac4b9e