Merge branch 'collectd-4.1'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Sep 2007 14:40:06 +0000 (16:40 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Sep 2007 14:40:06 +0000 (16:40 +0200)
commit0fbdd776a6d9203939d6c85139768adf2725059c
tree8a4de2abc6e18ab92bcb6df26dec763f8b44cdc5
parentf3aff73199d94c6eed0dffaeefb5b1b2b6c2c362
parentaad06a384be9b35bebfb10c048ce01129e384a7e
Merge branch 'collectd-4.1'

Conflicts:

ChangeLog
ChangeLog
src/snmp.c