Merge branch 'collectd-4.6'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 24 Feb 2009 09:15:52 +0000 (10:15 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 24 Feb 2009 09:15:52 +0000 (10:15 +0100)
commitf2938fd5c5f934521292acaee7e6e7d0f55b0113
tree473297eb9ef8dcf17fb2bc04f2734ee3d14af0f2
parent3f4dd2401e02446d17df6023933e92e494bfd869
parent7ef8f8ed456a9a1a6cfd5b9da04836bf867d6842
Merge branch 'collectd-4.6'