Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)
commita09f2fdf0450eb76317e1b7575a12ffb926068f4
treec4ce90f0039a2609bcbb49c8fb5fa97ba605a3f8
parenta9b65b73fc54f48b6f3633efa1a6c89f78a148bf
parent6124da7a48f28f54fc09ebeb942d1037516fe6ab
Merge branch 'collectd-5.4' into collectd-5.5
configure.ac
src/daemon/plugin.c
src/modbus.c