Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:55:12 +0000 (17:55 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:55:12 +0000 (17:55 +0100)
commitc3d354c58d56c4b2bb4138a227f3546928bd84f2
treef2f94d2d7f9851e109ba2249cf8018a9bd1e49f4
parent64b8150edec2271bb110f36e70915fdd87d9cac2
parent11c8a760c2d354b2f4637bdb297efb253bfaa519
Merge branch 'collectd-5.7'

Conflicts:
configure.ac
configure.ac
src/daemon/common.c