From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Mon, 19 Dec 2016 17:46:09 +0000 (+0100)
Subject: merge v1.0.2 -commit b1c42b6- into master
X-Git-Tag: v1.0.3~1^2~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=inline;h=2c31ee74f12d0f584c9191414ddab5ede6ea540d;hp=-c;p=osm%2FRO.git

merge v1.0.2 -commit b1c42b6- into master

Change-Id: Iec0283ef28a4407b72439b894e0f618ee54ac1d5
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

2c31ee74f12d0f584c9191414ddab5ede6ea540d