Code

Merge branch 'collectd-5.0' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:39 +0000 (12:49 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:39 +0000 (12:49 +0200)
commita60550f0b85d413957654546a87f00a95e59a26c
treeac029f4ce4166f6f5e10b6ad5aed97cd9d7fbe71
parenta5dac903c9dcc94ba911a91c754541e4534bb58c
parent400596160704146845940d7d9c4f794c0d2ddc03
Merge branch 'collectd-5.0' into collectd-5.1