Code

Merge branch 'collectd-5.0' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Fri, 7 Sep 2012 09:15:24 +0000 (11:15 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 7 Sep 2012 09:15:24 +0000 (11:15 +0200)
commitfda68e239798cea197a225ed5325f5bb3c2e70de
treef462028b0cfb6c0a33da163d07786aec3f19cba2
parent180f2ba844e00bd0e73acc5b4445b48652e47dcd
parentb4c8f3f762d666742c774ab3b45815e5a416e5da
Merge branch 'collectd-5.0' into collectd-5.1

Conflicts:
src/swap.c
configure.in
contrib/collection3/bin/index.cgi
src/Makefile.am
src/collectd.conf.pod
src/snmp.c
src/utils_avltree.c