From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Wed, 10 Aug 2016 15:29:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~75
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=98e5b69bace33efd7e52297b54d6b1d0aa3888de

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

98e5b69bace33efd7e52297b54d6b1d0aa3888de