Code

Merge branch 'collectd-4.7'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 19 Jul 2009 15:39:06 +0000 (17:39 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 19 Jul 2009 15:39:06 +0000 (17:39 +0200)
commit35f98b6e5c4c30bd7aeb52c7894c5f6e276638da
tree8da65ec8e016f33bdcf988e5263397886043e3e9
parent5137825deeb5d4a5b763185f45b3916ccc49340d
parent6ec92a34ccbd9454b48685e69405c633026cfe05
Merge branch 'collectd-4.7'