From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 24 Oct 2007 17:57:56 +0000 (+0200)
Subject: Merge branch 'ad/memcached'
X-Git-Tag: collectd-4.2.0~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d31f8651c7d7c25795f0047f10052be66a4cbdcc;p=thirdparty%2Fcollectd.git

Merge branch 'ad/memcached'
---

d31f8651c7d7c25795f0047f10052be66a4cbdcc