Merge branch 'docker-build'
authorpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 14 Sep 2017 06:27:51 +0000 (08:27 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 14 Sep 2017 06:27:51 +0000 (08:27 +0200)

Trivial merge