From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Wed, 26 Apr 2017 13:06:04 +0000 (+0200)
Subject: Merge branch 'v2.0'
X-Git-Tag: v2.0.1~24
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fopenvim.git;a=commitdiff_plain;h=b0c600d21ad65893f5e7ab4522565e8f66e195e9

Merge branch 'v2.0'

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

b0c600d21ad65893f5e7ab4522565e8f66e195e9