From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Mon, 19 Dec 2016 17:50:49 +0000 (+0100)
Subject: merge v1.0.2 -commit 8940f6c- into master
X-Git-Tag: v2.0.0~67
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fopenvim.git;a=commitdiff_plain;h=a07bb94512b45d83da8ae3fdcc42c9f2084a0fa0

merge v1.0.2 -commit 8940f6c- into master

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

a07bb94512b45d83da8ae3fdcc42c9f2084a0fa0