Code

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)
1  2 
src/exec.c
src/plugin.c

diff --cc src/exec.c
Simple merge
diff --cc src/plugin.c
Simple merge