Merge branch 'sh/collectd-5.1' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Mon, 27 Aug 2012 08:12:11 +0000 (10:12 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 27 Aug 2012 08:12:11 +0000 (10:12 +0200)
commit180f2ba844e00bd0e73acc5b4445b48652e47dcd
tree04b8d57d3192fc1d5093d841e8ea3003dfa56a8e
parentb736009816ddeb00a2ec4c7e3986f98522215afd
parent39ef2de9c9a29ae6ce6a2847361f6e25aa2117d1
Merge branch 'sh/collectd-5.1' into collectd-5.1