Merge branch 'uni/collectd-4.1' into collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:46:07 +0000 (11:46 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:46:07 +0000 (11:46 +0200)
commit549e1f3857209db73e5e254be7aa1782c5face0c
tree4b2f070dab079630534c759b1827722e49e369d2
parentd3648402a2a770bea639ae65c2ccd42196c7a490
parente9e15292f5e08e5e7e5f795ec5df2e3680042d88
Merge branch 'uni/collectd-4.1' into collectd-4.1