Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 10 May 2016 09:53:28 +0000 (11:53 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 10 May 2016 09:53:28 +0000 (11:53 +0200)
1  2 
src/collectd.conf.pod
src/processes.c
src/statsd.c

Simple merge
diff --cc src/processes.c
Simple merge
diff --cc src/statsd.c
Simple merge