Merge branch 'collection3-data-sources' of git://github.com/raimue/collectd
authorFlorian Forster <octo@collectd.org>
Wed, 13 Nov 2013 19:31:29 +0000 (20:31 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 13 Nov 2013 19:31:29 +0000 (20:31 +0100)
commita321fd49b6e74ffddd67e9c5b44b4d6ce3a8bbe8
tree7d4e9bff78745d9b02b19c7eef740051fe9c09b1
parent1c8181111fae3d36cd8c901f659f6d6e6a6759d4
parent5664fbad7ac174355ca4a5bee878634397d85464
Merge branch 'collection3-data-sources' of git://github.com/raimue/collectd