Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 May 2007 10:36:12 +0000 (12:36 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 May 2007 10:36:12 +0000 (12:36 +0200)
commit348fa70f34d7e32fafebb82053e0c84625c2ba67
treecafb360e10f047e669af3a46b533f94eb239f434
parent88f51307d9a642aed79d22450b03893bb1dca633
parent44e4d530c8db2e078cd73ab254d1be41a5f2812c
Merge branch 'pull/collectd-4' into collectd-4
configure.in