Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 24 Nov 2014 08:23:18 +0000 (09:23 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 24 Nov 2014 08:23:18 +0000 (09:23 +0100)
commit61bda3c7438f57086b0fcf87cc54407efcbaf9e3
treeab3e74aa5fed690ddd2d1511bdb5c30732c896f0
parent232898b5a6ee58d432a63d932a0ff447a606241d
parent51a4e62d7d0e73d8d5822efaef1e3218b5ad0373
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
src/write_graphite.c
src/Makefile.am
src/collectd.conf.pod
src/plugin.c
src/write_graphite.c