Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 13 Apr 2015 22:24:46 +0000 (00:24 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 13 Apr 2015 22:24:46 +0000 (00:24 +0200)
commite9ef1a2f33fb6fb5a379f877fb8c5bb0d3810fed
tree22a293b393b82d8eb31b301993427f446cdab9a5
parent079f487bae003575e360dcd6034546485f69b5c8
parent8df7333d670cf2a8da8716a2411844f6fc553fa9
Merge branch 'collectd-5.3' into collectd-5.4
version-gen.sh