From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Tue, 15 Nov 2016 19:35:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~45^2~32
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=dd26b9ea716ca0eee703aee695d84c0625bd8d8d

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

dd26b9ea716ca0eee703aee695d84c0625bd8d8d