Code

Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:44:01 +0000 (13:44 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:44:01 +0000 (13:44 +0100)
Conflicts:
src/plugin.c

1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge