From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Fri, 15 Apr 2016 09:22:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~148^2~4
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=8675d09a5488f60a856145f92380db6066200484;hp=-c

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

8675d09a5488f60a856145f92380db6066200484