From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Wed, 3 May 2017 10:55:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~30^2~12
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2542bfaa225f20272df99f1ccab5236326f16070;p=osm%2Fvim-emu.git

Merge remote-tracking branch 'upstream/master'
---

2542bfaa225f20272df99f1ccab5236326f16070