From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Wed, 26 Apr 2017 12:32:14 +0000 (+0200)
Subject: Merge branch 'v2.0'
X-Git-Tag: v2.0.1~25
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F1696%2F1;p=osm%2FRO.git

Merge branch 'v2.0'

Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

6df137c25d9e3d4ee3037df15c1c140660fbd9b3