Merge pull request #104 from mpeuster/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 12 May 2016 19:42:12 +0000 (21:42 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 12 May 2016 19:42:12 +0000 (21:42 +0200)
re-test to check jenkins config


Trivial merge