Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 14:13:35 +0000 (16:13 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 14:13:35 +0000 (16:13 +0200)
commit759c544568c019721fe868e7c319bd1471fd501c
treedc16de780d3c81658133391fca703fc6985979b2
parent53bd9256920f01cc5b835639c7e7971979ed3350
parentd45c77caacd134faa08f87cf8f5206499c5b1958
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

configure.in
configure.in