From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Fri, 13 May 2016 12:40:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~123^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=dd10a79af85e59df468550f031bcfd197bf53632;p=osm%2Fvim-emu.git

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

dd10a79af85e59df468550f031bcfd197bf53632