Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)
commit3b51243382501d5f3cdda79d30c7ecf39d22dd87
treed9bc9eca5c85306544fa8cd5238e5ac81cd0971a
parent9706a2064c099666f24ba2fa8576629fc97310cd
parentd6021a800b12c89b5a78877af2c5b9abc1a8e609
Merge branch 'collectd-5.1' into collectd-5.2
src/exec.c
src/plugin.c