Merge remote-tracking branch 'amarx/collectd4' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Feb 2015 22:56:18 +0000 (23:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Feb 2015 22:56:18 +0000 (23:56 +0100)
commitdb2e0a5baecda01fe22a7bb17010dcb1a73b372b
treed43a1793a670a01e5084e654d62b69acd681a199
parent32e321b248ae4501ad17d7edc50bb23aaa4b5c6e
parent2056dd3033ff6fb5a3ac709c63e7c9696741f2a1
Merge remote-tracking branch 'amarx/collectd4' into next