Merge branch 'pull/collectd-4.1' into collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 1 Nov 2007 09:07:03 +0000 (10:07 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 1 Nov 2007 09:07:03 +0000 (10:07 +0100)
1  2 
src/types.db

diff --cc src/types.db
Simple merge