Code

Merge branch 'collectd-4.4'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 21 Aug 2008 15:24:40 +0000 (17:24 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 21 Aug 2008 15:24:40 +0000 (17:24 +0200)
1  2 
src/memcached.c
src/plugin.c

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