Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:18 +0000 (08:47 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:18 +0000 (08:47 +0100)
commitce0118ae5a67654cce06dddc9998dc494beb4251
tree133a754b2797b2a7ec68ddfca31a61429deab0b1
parenta24baf2ad70837ea46cacbfee6e03537cf284ad5
parent48cde211ba0b69555478b2069ca0bc4051661b0b
Merge branch 'collectd-4.9' into collectd-4.10