Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 25 Nov 2010 10:51:17 +0000 (11:51 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 25 Nov 2010 10:51:17 +0000 (11:51 +0100)
commit613f5b8a4a3ec711b29928ba78ab7d318ff169fc
tree75ffdb5b525ced8b3c6be4e26edbb55ccf9e9d00
parent0a6626747f40f7a39947033e8e64242e731cd7e1
parentab9fd6d9336a623b7feb73e284cbd072496de102
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9