From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Sat, 16 Jul 2016 21:51:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~93
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=e662ef8d5d4370961a9aa896c66615e7fa66819a

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

e662ef8d5d4370961a9aa896c66615e7fa66819a