From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 16 Oct 2008 20:14:28 +0000 (+0200)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~175
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=568420ac172981edccb8587cc9651952fe350365

Merge branch 'collectd-4.5'
---

568420ac172981edccb8587cc9651952fe350365