Code

Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@noris.net>
Tue, 6 Nov 2007 16:40:35 +0000 (16:40 +0000)
committerFlorian Forster <octo@noris.net>
Tue, 6 Nov 2007 16:40:35 +0000 (16:40 +0000)
commit7a8e55e284c85ec5cd63ed457515769509308cc5
tree87e84dcd50a8b1974c1fea9a013f566f72488d21
parent4cf2c215b461a4560203c060681a135af5f9cdaf
parentb641906ca7c4652e5234dce65ca43dd875f3a7ae
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

contrib/README
src/snmp.c
src/types.db
contrib/README
src/snmp.c
src/types.db