Code

Merge branch 'collectd-5.2' into collectd-5.3
authorFlorian Forster <octo@collectd.org>
Thu, 30 May 2013 07:00:09 +0000 (09:00 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 30 May 2013 07:00:09 +0000 (09:00 +0200)
commit38e2d0eff79464e4b9686e135a184411d9307db7
tree455e06ecc7019b381ad99f57c8c19e22d11fcfd6
parentfb67910d554cbf5d6c7035a72561058e8d92f90c
parent178db08806318e0b01de2e7a9261f18d6f7ca72d
Merge branch 'collectd-5.2' into collectd-5.3
src/collectd.conf.pod
src/configfile.c
src/types.db