Merge branch 'sh/next' collectd-4.6.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 21:56:37 +0000 (22:56 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 21:56:37 +0000 (22:56 +0100)
commit2084476fec843de625cc59c86d43b43b7fb88fd9
tree7c51190b8cbf8272f98988a11e90091ecd39f3c3
parent4dd2f8658b39af8bd4fe6ece7c72cedf4aa5c9a2
parent878bbfa128acf19da369452f12db5609e2b7d037
Merge branch 'sh/next'