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)
commit2b7765f2750a8bedeb3d7cab62a7c6df2fd15d78
treee8639d485217ceb9b15e6df9ccb40d3aef49c0fa
parent7bd27f656950074f6fd06ffce754a0f14004b5a6
parentc12f9766da652bfa4bed24f077c5666389c2bdbe
Merge pull request #104 from mpeuster/master

re-test to check jenkins config