Merge branch 'collectd-4.6'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:38 +0000 (18:52 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:38 +0000 (18:52 +0100)
commitd37ebe6eb6dd2bbf8213a924dfbce6e91945aab8
tree5f0253a33f3dc4daa060eb8928aa2240b3308af3
parentcc5ee53dfba55d6fe7c26513618a582adf80b7fa
parente8999694aac7184ac4eea29564a2892f188c4171
Merge branch 'collectd-4.6'
src/bind.c
src/common.c
src/types.db