From: Jan Michel <j.michel@gsi.de>
Date: Mon, 27 Mar 2017 16:18:27 +0000 (+0200)
Subject: Merge branch 'master' of jspc29:daqtools
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=1e5d8715093b51a849904312a24cd8296840e3eb;p=daqtools.git

Merge branch 'master' of jspc29:daqtools
---

1e5d8715093b51a849904312a24cd8296840e3eb