Merge branch 'ff/snmp' into collectd-4.10
authorFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 08:01:44 +0000 (10:01 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 08:01:44 +0000 (10:01 +0200)

Trivial merge