Code

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)
commit148e8732e45435a051df1c3673cad0d5dc77492f
tree040926ecc5a010c071e0a02cc8ad052c430a1b05
parent6a968db27aab6d8c4cfe4f6e4c5bf3183eb84794
parent66e0fe82631c8a8e44ffcad8ffd378fab83bc83f
Merge branch 'collectd-4.4'

Conflicts:

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