From: Florian Forster <octo@noris.net>
Date: Wed, 23 Jul 2008 15:18:13 +0000 (+0200)
Subject: Merge branch 'master' of git://git.verplant.org/collectd
X-Git-Tag: collectd-4.5.0~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0421d0d777f6df3cf78fd5366c82b0ed7adb9684;p=thirdparty%2Fcollectd.git

Merge branch 'master' of git://git.verplant.org/collectd
---

0421d0d777f6df3cf78fd5366c82b0ed7adb9684