Merge branch 'master' into katzj/memory
authorFlorian Forster <octo@collectd.org>
Tue, 14 Jan 2014 07:43:06 +0000 (08:43 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 14 Jan 2014 07:43:06 +0000 (08:43 +0100)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge