Merge branch 'collectd-4.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
commitb53110ef99e3d6a5e2f8e79b8f068cfe96a1accb
tree4f160197b9191453db6ac038823615806e54841e
parente7be1d7ea062e8d4d59c04c42e63d655188dc597
parentc15dbfc3739f7c3bbd8171797eaef55749008bfa
Merge branch 'collectd-4.10'
src/collectd.conf.pod
src/configfile.c