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

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

5e040bf29bd5cda68f1416b48227a7419cb6fee0