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)
commit5b5f7f4e3dd28d9e41469c331f3f9f6a09e3147b
tree71ed0fe87e164802a8e1aad7e9bbe21d38f7f95c
parent2aaabc7592009a1f6e2d6033a79d3041b05ab500
parentd9ba7e3ed5d93e9abd34f961fff51676a096ac02
Merge branch 'collectd-4.4'
src/memcached.c
src/plugin.c