From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Tue, 3 May 2016 09:23:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~133^2~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=inline;h=ee2f7e896f66d1fcb1729b2b83221c2e401bf879;p=osm%2Fvim-emu.git

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

ee2f7e896f66d1fcb1729b2b83221c2e401bf879