From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Thu, 14 Sep 2017 06:27:51 +0000 (+0200)
Subject: Merge branch 'docker-build'
X-Git-Tag: v3.1~8^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=219a93c957ab49203cf8fdc54a4a4953022a28a9;p=osm%2Fvim-emu.git

Merge branch 'docker-build'
---

219a93c957ab49203cf8fdc54a4a4953022a28a9