Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:25:02 +0000 (09:25 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:25:02 +0000 (09:25 +0200)
commit02c45fc2ecb087fb140e90217e5b701959306c1a
tree297c6a123144a65f904fd0f297464405cfd5321d
parente9ef1a2f33fb6fb5a379f877fb8c5bb0d3810fed
parent82e27678f8972d2625b466e7e7ba9daaa6395c98
Merge branch 'collectd-5.3' into collectd-5.4
src/Makefile.am