Code

Merge branch 'collectd-4.4'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 09:04:23 +0000 (11:04 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 09:04:23 +0000 (11:04 +0200)
commitcacaa2126020832df99fa6423147bd3de6d4faae
tree35069a1bfcd1e1f3d7a55b8bce203e740d5c6989
parentd98487a27d294e31f483b9d43e0d6c02717d248c
parentd22aee658210cbfa44caa39f302aa9331d4eab82
Merge branch 'collectd-4.4'

Conflicts:

src/collectd-perl.pod
src/email.c
src/collectd-perl.pod
src/collectd.c
src/email.c
src/interface.c
src/load.c
src/memory.c
src/perl.c
src/swap.c