From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 26 Oct 2006 20:32:19 +0000 (+0200)
Subject: Merge branches 'ff/ping', 'ff/macosx-swap' and 'ff/netbsd' into collectd-3.10
X-Git-Tag: collectd-3.10.2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cbabad060704bcdef0d427d71fa873ea30ab933b;p=collectd.git

Merge branches 'ff/ping', 'ff/macosx-swap' and 'ff/netbsd' into collectd-3.10
---

cbabad060704bcdef0d427d71fa873ea30ab933b