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

Merge branch 'v2.0'
---

9a4c35c99529d07696b140c4e35e06d9aac2cfe3