From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 2 May 2009 08:50:56 +0000 (+0200)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.7.0~28^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de0fdb208de123fe753c5fcf03533833777a5b4a;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-4.5' into collectd-4.6
---

de0fdb208de123fe753c5fcf03533833777a5b4a