Merge branch 'collectd-4.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 19 Aug 2010 13:02:48 +0000 (15:02 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 19 Aug 2010 13:02:48 +0000 (15:02 +0200)
commitd1c3baabf0c7bf65f699fb66db5b2aea92d1f5e7
tree7e953e8282da5dd4511da71e2e02a4b067dd4fcf
parent959e4e77abe00cd4e081a6555df00cbde86e0ce8
parent97addf1e406c75be500ae020635f3cb389f206e0
Merge branch 'collectd-4.10'