From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Wed, 24 May 2017 09:23:28 +0000 (+0200)
Subject: Merge branch 'v2.0'
X-Git-Tag: v3.0.0~25
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=b36e75da99170c650c999ab2b985a14f3b9a7b5a

Merge branch 'v2.0'
---

b36e75da99170c650c999ab2b985a14f3b9a7b5a