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

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

aceb1178852652f3c8ff9b703098c66f3120a110