From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Thu, 14 Sep 2017 06:29:05 +0000 (+0200)
Subject: Merge branch 'docker-build' into osm/master
X-Git-Tag: v4.0.0~15^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b575d50ed85c325720c92c712434bbf40b64a759;p=osm%2Fvim-emu.git

Merge branch 'docker-build' into osm/master
---

b575d50ed85c325720c92c712434bbf40b64a759