Code

Merge branch 'collectd-4.2'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 8 Nov 2007 21:22:19 +0000 (22:22 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 8 Nov 2007 21:22:19 +0000 (22:22 +0100)
commit34749e7ebe508b1d563af287b180e951b7822bcd
tree191daa4fb801564f8c692f688f2fabd980fe5f08
parentc6be63a74e2ed88ec7dc1d88d09896520bb8b7a1
parent3734b4e6e24b558d275b4760e537b35f7506b634
Merge branch 'collectd-4.2'

Conflicts:

src/types.db
src/exec.c
src/types.db