From: Jan Michel <j.michel@gsi.de>
Date: Wed, 28 Aug 2013 15:04:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=b8d82b7c6e3a8e38953b71b98e2ad639146f9c5a;p=daqtools.git

Merge remote-tracking branch 'origin/master'
---

b8d82b7c6e3a8e38953b71b98e2ad639146f9c5a