Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 09:32:22 +0000 (11:32 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 09:32:22 +0000 (11:32 +0200)
commitc346dc6b18ee4215ccab911c1732c5c39a961baf
tree599a420d43183c4f0a13fd60bca507e09a5e14eb
parent9dbdf7b5ddeb11a7746009be443d63493408f613
parentf86731f4fca466e89453b02bf185730e7d547898
Merge branch 'collectd-5.4' into collectd-5.5
src/collectd.conf.pod
src/processes.c