From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Sun, 4 Dec 2016 09:18:45 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/v1.0'
X-Git-Tag: v1.1.0~39
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F757%2F1;p=osm%2FUI.git

Merge remote-tracking branch 'origin/v1.0'

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
---

a6690e0878612ca0ffb7119c95a033dd1d7d1246