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/?a=commitdiff_plain;h=d573573c267f0db9ee21c454ed2a5a086967c81e;hp=557e2f6e274d27d0d70d1577298c44cdc62507b5;p=osm%2FRO.git

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