From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Fri, 20 May 2016 07:40:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~119^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=1df4c60a009aa76779c573cc035ea3f49ba5dd87;p=osm%2Fvim-emu.git

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

1df4c60a009aa76779c573cc035ea3f49ba5dd87