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

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

3989dcc6e2c8564fc2d8c9057d669bb56e4298b3