Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Fri, 30 Nov 2012 06:22:11 +0000 (07:22 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 30 Nov 2012 06:22:11 +0000 (07:22 +0100)
commit7ca030dea2fcb1f16516e988ab4bd1fcba0efe7b
tree8fc98a215b84ed685355cd1c9d097315d198120b
parenteda788724cca6ec8cdb19bb403d62e1b95af6f31
parenta8c7622252cf8fd8467a7eb9c800060d1d1c27d1
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2