Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 20:04:03 +0000 (22:04 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 20:04:03 +0000 (22:04 +0200)
commit334b552e146d572d16333771c56b63b1ba30db2b
tree6bbf4652f706f5018213ce05e8b54fb8f00da7b0
parent5eb71045f1d3b72b17e922a86b5014f68345b5b3
parenta5dac903c9dcc94ba911a91c754541e4534bb58c
Merge branch 'collectd-5.1'