Merge branch 'collectd-4.4'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 27 Aug 2008 08:13:24 +0000 (10:13 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 27 Aug 2008 08:13:24 +0000 (10:13 +0200)
1  2 
bindings/perl/Collectd/Unixsock.pm
src/collectd.conf.in
src/collectd.conf.pod
src/memcached.c
src/perl.c

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