From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Wed, 11 May 2016 14:17:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~128^2~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=19f830b3624710e82d494cb28d8755fdbcb40e9d;p=osm%2Fvim-emu.git

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

19f830b3624710e82d494cb28d8755fdbcb40e9d