From: Florian Forster <octo@noris.net>
Date: Tue, 30 Oct 2007 16:19:04 +0000 (+0000)
Subject: Merge branch 'collectd-4.1' into collectd-4.2
X-Git-Tag: collectd-4.2.1~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=939a113b288dfdee7df2263c682d27d7146c6013;p=collectd.git

Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

	src/collectd-snmp.pod
---

939a113b288dfdee7df2263c682d27d7146c6013