From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Tue, 30 Dec 2008 16:24:06 +0000 (+0100)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.5.2~2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=66b7c4bce4e628d8c11cc6762621f155bd68536d

Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

	src/network.c
---

66b7c4bce4e628d8c11cc6762621f155bd68536d