Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 18 Mar 2016 22:44:17 +0000 (23:44 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 18 Mar 2016 22:44:17 +0000 (23:44 +0100)
commit3aeca36659b04725028f123bcea387a37581624a
tree6508f52c353f087f77ed776f1263d8c046d514c4
parent25b5f5c49dd50c64f41b7bf69b8e471b0ffc6f15
parent6518cae7c97b5bb1ac3e1d1eca841fe41b5cb656
Merge branch 'collectd-5.4' into collectd-5.5
contrib/redhat/collectd.spec