Merge branch 'pull/collectd-4.3' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 17 Mar 2008 09:45:23 +0000 (10:45 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 17 Mar 2008 09:45:23 +0000 (10:45 +0100)
commit759ff59543558ece7b675395c2e39dc315f12377
tree65bebb3636b13ca1e3f6b86879381ce0a9bc095d
parent1297a3723f6c5a79e8148e56c249a1aa7d3c6f35
parent540075ba2da73c2282bdfab894a5d12eabeffa65
Merge branch 'pull/collectd-4.3' into collectd-4.3