From: PANDA DIRC <hadaq@dircdaq002.gsi.de>
Date: Sun, 29 Jun 2014 19:24:36 +0000 (+0200)
Subject: merge with head, michael
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7cd4e250d9e45c2a00003a1fd71315a9f5908eae;p=daqtools.git

merge with head, michael

Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
---

7cd4e250d9e45c2a00003a1fd71315a9f5908eae