Merge branch 'collectd-4.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 27 Nov 2010 10:46:11 +0000 (11:46 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 27 Nov 2010 10:46:11 +0000 (11:46 +0100)
commit853b3da5d4c6614d7db4093f57b1ca4f57b6c485
tree3082bc28e3308a2b5aff25f2cd754103c6d6f28c
parent5c4d218936559af2f6cb9857af7f5b9c8d83be6d
parentb6c3774b0d4690d666a12cfeeff28a158484a36b
Merge branch 'collectd-4.10'

Conflicts:
src/utils_rrdcreate.c
src/collectd.conf.pod
src/netapp.c
src/swap.c
src/utils_rrdcreate.c