Code

Merge branch 'collectd-4.1'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 19:36:44 +0000 (21:36 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 19:36:44 +0000 (21:36 +0200)
commitb7d4060cacd04d4bd0e174e85f91ca5afcacf01d
tree5ab5df883487d89ea3fd0ce66ea05d332a6a41c3
parent87e0b48747170a355f6a703be523a7dbbfbd8549
parent52b6308247a1656d7e5a69c99eff3b4a19c6b844
Merge branch 'collectd-4.1'

Conflicts:

ChangeLog
contrib/PerlLib/Collectd.pm
ChangeLog