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

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

4558b0cf805eb6f6b3c998b61b3a66038510b882