From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri, 21 Apr 2017 12:15:35 +0000 (+0200)
Subject: Merge branch 'master' into v2.0
X-Git-Tag: v2.0.0~15
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fopenvim.git;a=commitdiff_plain;h=27c1c9221acccde1378a12404054f1e545de8ca5

Merge branch 'master' into v2.0
---

27c1c9221acccde1378a12404054f1e545de8ca5