From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Thu, 9 Feb 2017 12:56:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Tag: v3.1~45^2~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=e5ed9d18877fae6cf7b42af20bc19595c789568b;p=osm%2Fvim-emu.git

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

e5ed9d18877fae6cf7b42af20bc19595c789568b