Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 09:32:49 +0000 (11:32 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 09:32:49 +0000 (11:32 +0200)
1  2 
src/collectd.conf.pod
src/processes.c

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