From: Manuel Penschuck <manuel.penschuck@stud.uni-frankfurt.de>
Date: Mon, 1 Dec 2014 15:40:06 +0000 (+0100)
Subject: Merge necessary, sorry
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=a8eee1b1df3221427cf4fb24a269b5afba939f43;p=daqtools.git

Merge necessary, sorry
---

a8eee1b1df3221427cf4fb24a269b5afba939f43