From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Mon, 6 Feb 2017 11:32:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'steven/master'
X-Git-Tag: v3.1~48^2~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=08f91be07d9124986dacf05b7cd87eb8d3d8b338;p=osm%2Fvim-emu.git

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

08f91be07d9124986dacf05b7cd87eb8d3d8b338