From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 17 Aug 2009 08:46:05 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~45
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=1e4db580e37d235755de0c4a4c08ba7a6ac7bb4c

Merge branch 'collectd-4.7'

Conflicts:
	src/network.c
---

1e4db580e37d235755de0c4a4c08ba7a6ac7bb4c