From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Thu, 14 Jul 2016 18:52:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~97
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=aba0a5ebb8a7c606e988bbbb01c7875447d23ebe;hp=aba0a5ebb8a7c606e988bbbb01c7875447d23ebe;p=osm%2Fvim-emu.git

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