From: Bob Gallagher <bob.gallagher@riftio.com>
Date: Mon, 24 Apr 2017 17:57:43 +0000 (-0400)
Subject: Merge from master
X-Git-Tag: v2.0.0~1
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=f9a2688a7553a59ce700ea5edb859f89eecb8a29;hp=f9a2688a7553a59ce700ea5edb859f89eecb8a29

Merge from master

Change-Id: I8d374af11a10b7ba37d25a8c6c2b89275a49beb6
Signed-off-by: Bob Gallagher <bob.gallagher@riftio.com>
---