From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 26 Mar 2008 08:48:27 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc0a8f260e4e24bdf664c3dcff919b6f99bfe31d;p=collectd.git

Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

	src/unixsock.c
---

bc0a8f260e4e24bdf664c3dcff919b6f99bfe31d