From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Thu, 13 Apr 2017 11:47:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~30^2~32
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=0bb3d47c04f09934885a06f987ff4f520ed5daac;p=osm%2Fvim-emu.git

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

0bb3d47c04f09934885a06f987ff4f520ed5daac