Code

Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 1 Oct 2009 19:34:21 +0000 (21:34 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 1 Oct 2009 19:34:21 +0000 (21:34 +0200)
commit7936f094388707ee066b2e9f3fc75659e1715181
treecd201700f4d061218d18a1086e7d9b72ac52bd32
parente28686b873599cc18c5e0985cf41589a9aa2b4c6
parent6c134837a38a566a6ad78225ef5e5c3cc9b7d832
Merge branch 'collectd-4.8'

Conflicts:
src/types.db
README
src/types.db