From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Tue, 9 Aug 2016 21:39:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~81
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=4c8ea0150b9a89ce977fd62e5f102c49d2acb972;p=osm%2Fvim-emu.git

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

4c8ea0150b9a89ce977fd62e5f102c49d2acb972