Merge branch 'collectd-4.9'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 11:11:28 +0000 (12:11 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 11:11:28 +0000 (12:11 +0100)
commit413c4dab34e5cbb227644dd3ead6e6e0a3cdb08c
treea02f06486eeff239ed93d9e49387835d7e7813fd
parentb99344009665e5948d80e4347b39247d71b3843d
parent34f7eda9ad2cbd2cd5620c0a2d76d282e790b4de
Merge branch 'collectd-4.9'