Merge remote-tracking branch 'remotes/upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 8 Feb 2017 11:25:53 +0000 (12:25 +0100)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 8 Feb 2017 11:25:53 +0000 (12:25 +0100)
commite0796231bf6fd5b7d09d4a850227be7bc9bbdc6a
treee972c8caf730f1d4e149769819cfce4875dd9df9
parente074d11450cd221a6005598e89bc0f0f1de63f40
parent92eccf5a7378aa76b258d17234f64fcabb24ceb0
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
utils/docker/Dockerfile
utils/docker/entrypoint.sh