Merge remote-tracking branch 'mfischer/daq' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:05:26 +0000 (00:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:05:26 +0000 (00:05 +0100)

Trivial merge