From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 12 Jan 2017 14:03:58 +0000 (+0100)
Subject: Merge branch 'v1.0'
X-Git-Tag: v1.1.0~28
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F933%2F1;p=osm%2FRO.git

Merge branch 'v1.0'
---

59f45266ae0e573d0d4e6dcfec04f4a715faeaf2