From: Florian Forster <octo@collectd.org>
Date: Sat, 23 Mar 2013 09:13:02 +0000 (+0100)
Subject: Merge branch 'collectd-5.2'
X-Git-Tag: collectd-5.3.0~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=632e1074beb71748f866087bcdf9b0ba1b1d2405;p=collectd.git

Merge branch 'collectd-5.2'

Conflicts:
	configure.in
---

632e1074beb71748f866087bcdf9b0ba1b1d2405