Merge remote-tracking branch 'origin/collectd-5.1' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 20:03:51 +0000 (22:03 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 20:03:51 +0000 (22:03 +0200)
commita5dac903c9dcc94ba911a91c754541e4534bb58c
tree0151547e4af8f20d6ce1974e0bef61cc68d41739
parent5fb8bff2b2d2d5c61621c6686b343d7e0eea48f0
parent60c6faf4fe7779e3d2f1c0c807103bbd2ee0c697
Merge remote-tracking branch 'origin/collectd-5.1' into collectd-5.1