From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Fri, 6 May 2016 08:35:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~129^2~7
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=1603244abb424f6a2779ced2328231bca0cfab62;p=osm%2Fvim-emu.git

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

1603244abb424f6a2779ced2328231bca0cfab62