Code

Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 16:33:17 +0000 (17:33 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 16:33:17 +0000 (17:33 +0100)
1  2 
contrib/redhat/collectd.spec
src/processes.c

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