Code

Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 11:35:23 +0000 (12:35 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 11:35:23 +0000 (12:35 +0100)
commit7c8fb05fcb919fb2d9fc68757c198916396600ce
treed2a7670c7d22fd4113b5973d4eb94819e6911eaa
parent49f55f7f02eeb1b9ef72703d7f5cbb7cde202415
parentb2491d8cc416955fb0df16b74a28f218a2dedc01
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

configure.in
configure.in
contrib/collection.cgi