From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Sat, 22 Oct 2016 09:18:35 +0000 (+0200)
Subject: Merge branch 'master' into v1.0
X-Git-Tag: v1.0.1~5
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F66%2F566%2F1;p=osm%2FSO.git

Merge branch 'master' into v1.0

Change-Id: I28c3c3aa0fd936afdb610632836dee9b07f94b08
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

e5ce4ffee708ce25521d0a95280c25904ab94ddd