From: Florian Forster <octo@collectd.org>
Date: Sat, 25 Feb 2012 17:16:59 +0000 (+0100)
Subject: Merge branch 'collectd-5.0'
X-Git-Tag: collectd-5.1.0~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3b473acc5d4d27e5cf5101a4b8cc8a21c2bb7262;p=collectd.git

Merge branch 'collectd-5.0'

Conflicts:
	src/amqp.c

Change-Id: I85ab3ee2b51830ad0b5d474cf1f18b5c828d6588
---

3b473acc5d4d27e5cf5101a4b8cc8a21c2bb7262