From: Florian Forster <octo@collectd.org>
Date: Sun, 21 Aug 2011 14:51:36 +0000 (+0200)
Subject: Merge branch 'collectd-5.0'
X-Git-Tag: collectd-5.1.0~53
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9b967a770f38099336c3652986d93c8b4d610a36;p=collectd.git

Merge branch 'collectd-5.0'

Conflicts:
	configure.in
	src/owniptc/libiptc.c

Change-Id: I0ab8fc1accd476f5d1a243b1a155eac4b751cd8c
---

9b967a770f38099336c3652986d93c8b4d610a36