Merge branch 'collectd-4.10' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:17:27 +0000 (09:17 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:17:27 +0000 (09:17 +0200)
commit82e27678f8972d2625b466e7e7ba9daaa6395c98
tree5dbcf7927fa40c856d740a5f39fdef269bff3cd5
parent8df7333d670cf2a8da8716a2411844f6fc553fa9
parent0632ace737ca2d9808c3daf61935ff94bfe9e503
Merge branch 'collectd-4.10' into collectd-5.3
src/Makefile.am