Code

Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:44 +0000 (12:49 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:44 +0000 (12:49 +0200)
commit2979ae00227051ea79c9294ebfaf8337e8e308e2
tree64671842868784d6388f3f314214a5d1ebb5bff9
parent9e895cf1cfa418fe8bd4e3f63045ff3cd9f28b70
parenta60550f0b85d413957654546a87f00a95e59a26c
Merge branch 'collectd-5.1'