From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 6 Nov 2010 11:15:44 +0000 (+0100)
Subject: Merge branch 'master' into ff/netlib
X-Git-Tag: collectd-5.2.0~18^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da69316b56551acab689af78809ec88d48a601cd;p=thirdparty%2Fcollectd.git

Merge branch 'master' into ff/netlib
---

da69316b56551acab689af78809ec88d48a601cd