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

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

4b8b82f112f7531e03843dd3f7534430315f9bc2