From: Florian Forster <octo@collectd.org>
Date: Thu, 11 Oct 2012 08:07:41 +0000 (+0200)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.0.5~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ab6ab6ad6428ba0a0987a20a7d1cfa47d6cc6f8b;p=collectd.git

Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
	src/snmp.c
---

ab6ab6ad6428ba0a0987a20a7d1cfa47d6cc6f8b