From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Thu, 12 May 2016 14:36:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~124^2~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=418815231ec9713829606e56e3cf6ea022b3dccf;p=osm%2Fvim-emu.git

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

418815231ec9713829606e56e3cf6ea022b3dccf