From: Kiran Kashalkar <kiran.kashalkar@riftio.com>
Date: Fri, 12 May 2017 14:52:31 +0000 (+0000)
Subject: Merge branch 'v2.0'
X-Git-Tag: v3.0.0rc~18
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=356b9d1489b68110f47a73fcf0558f3ab405ed37;p=osm%2FUI.git

Merge branch 'v2.0'
---

356b9d1489b68110f47a73fcf0558f3ab405ed37