Code

Merge branch 'collectd-5.6' into collectd-5.7
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 10 Jan 2017 22:01:43 +0000 (23:01 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 10 Jan 2017 22:01:43 +0000 (23:01 +0100)
commite37e426d6646d6ff99834461f00c3dd79fa85d43
treedb5eda5ee02204832a0418e28cf0af073a2c09c0
parentd3be3ed7cb69be4a9a256449d4885d4a55399de0
parent3d964c1be299eb1a078051e913478c2767ffe946
Merge branch 'collectd-5.6' into collectd-5.7
contrib/redhat/collectd.spec
src/Makefile.am