Merge branch 'collectd-5.0' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 11:41:09 +0000 (12:41 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 11:41:09 +0000 (12:41 +0100)
commitb850c79322880d2b1936bc8babaf42e3657d942b
tree7d91abff5fa6006b3c041d99ada6c599693e72bb
parent3066976a238c67c0f6ac874d3d08394a4e2a247f
parentcc0bb2b472628ccede974a02c822d1f9189f0d21
Merge branch 'collectd-5.0' into collectd-5.1