From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Tue, 14 Feb 2017 11:03:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Tag: v3.1~44^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f045c142ee82c8da93756f4addff67dbf305888b;hp=33d768923110817c5c364cda695e4699c8431776;p=osm%2Fvim-emu.git

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