From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Wed, 29 Jun 2016 08:26:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~108^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=6ff3e7247ba6e55327d4d5568d4b070b870fc05b;p=osm%2Fvim-emu.git

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

6ff3e7247ba6e55327d4d5568d4b070b870fc05b