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

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

6efa9137f3fb89ac42351b0fd3cc76042b4059b0