Code

Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Thu, 31 Jan 2013 20:07:45 +0000 (21:07 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 31 Jan 2013 20:07:45 +0000 (21:07 +0100)
commitdd33aecf52f443aeb2ef7c3c289ed418b18569f7
treec30b3281e3b367382212a4b809e26d2980ca4365
parentab545e195574fe49fc3f0a4b03bd8eee8e08fb60
parent091ef34b141ca46e401d092d2ca3f675e6824956
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
ChangeLog