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

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

e8ca4ed9494c9268e0bd9a48f02b7edc150b6c57