Merge branch 'collectd-4.4'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Aug 2008 07:21:37 +0000 (09:21 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Aug 2008 07:21:37 +0000 (09:21 +0200)
Conflicts:

src/collectd.conf.pod

1  2 
src/collectd.conf.pod
src/common.h
src/memcached.c

Simple merge
diff --cc src/common.h
Simple merge
diff --cc src/memcached.c
Simple merge