Merge branch 'collectd-4.5'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Oct 2008 20:50:15 +0000 (22:50 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Oct 2008 20:50:15 +0000 (22:50 +0200)
commit2f712e8af3ae9461df24fe92098b44a0ee07d291
tree0165ea574ae56a76754a8363dbd3180d8744a895
parent568420ac172981edccb8587cc9651952fe350365
parentb9c2738e04853c8e9ae6be1d459365d556fa46c3
Merge branch 'collectd-4.5'