Merge branch 'collectd-5.2' into collectd-5.3
authorFlorian Forster <octo@collectd.org>
Sat, 13 Jul 2013 09:23:32 +0000 (11:23 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 13 Jul 2013 09:23:32 +0000 (11:23 +0200)
commita320c4a23fee0e900a7cd2310c771b8dbd2a2d82
treed00ce8c3c88a7813da011c533bc24863da16b229
parentbc389fa32a48a64306f7ec008f4548f05fdb7c80
parent0e835c8e64bb4bc9119948a3324a8a370bd10356
Merge branch 'collectd-5.2' into collectd-5.3
src/plugin.c
src/write_graphite.c