From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri, 21 Apr 2017 12:18:06 +0000 (+0200)
Subject: Merge branch 'master' into v2.0
X-Git-Tag: v2.0.0~20
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=d573573c267f0db9ee21c454ed2a5a086967c81e

Merge branch 'master' into v2.0
---

d573573c267f0db9ee21c454ed2a5a086967c81e