Code

Merge branch 'collectd-4.10' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)
1  2 
src/collectd.conf.in
src/types_list.c

Simple merge
Simple merge