From: Florian Forster <octo@collectd.org>
Date: Sun, 19 Feb 2012 10:21:31 +0000 (+0100)
Subject: Merge branch 'collectd-5.0'
X-Git-Tag: collectd-5.1.0~34
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=45aa67ef031ed2b8083f92efa2cbb76e0da8c02e;p=collectd.git

Merge branch 'collectd-5.0'

Conflicts:
	configure.in

Change-Id: Ifffa7df6b6c758650af7d942c26c8bd89568d8ea
---

45aa67ef031ed2b8083f92efa2cbb76e0da8c02e