Code

Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Tue, 9 Apr 2013 00:44:55 +0000 (17:44 -0700)
committerFlorian Forster <octo@collectd.org>
Tue, 9 Apr 2013 00:44:55 +0000 (17:44 -0700)
commit32e0d9078b73eeb889b9a1e62be72ded48d33d7d
tree3c56718ec546dddc508e1fb7aa9db483c397c491
parent86d3fe407e7a9553709304a88c0b7ab1f8c0e4d9
parentd4fcd06107c3c3b0cfcbc8a5014f60d874509b76
Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.1

Conflicts:
ChangeLog
version-gen.sh
ChangeLog