From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 22 Aug 2007 14:36:10 +0000 (+0200)
Subject: Merge branch 'sh/master'
X-Git-Tag: collectd-4.1.0~28^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=66ade8b7294e88030555575fdba4e90867f62599;p=collectd.git

Merge branch 'sh/master'

Conflicts:

	configure.in
---

66ade8b7294e88030555575fdba4e90867f62599