From: Michael Tremer Date: Mon, 2 Feb 2015 22:56:18 +0000 (+0100) Subject: Merge remote-tracking branch 'amarx/collectd4' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db2e0a5baecda01fe22a7bb17010dcb1a73b372b;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'amarx/collectd4' into next --- db2e0a5baecda01fe22a7bb17010dcb1a73b372b