Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:54:54 +0000 (16:54 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:54:54 +0000 (16:54 +0200)
commitc11a279ed19722816ccc56537a7d928ed06c6bab
tree2acfa97aea779a505f99d17e05ac2aa9bb261b27
parenta9463994041a275662c555d883521d0c8c23e812
parent2c7b491427fd84c9e24c9d41686a15ce42219a0b
Merge branch 'collectd-5.5'

Conflicts:
configure.ac
configure.ac
src/Makefile.am
src/collectd.conf.in
src/processes.c