Merge branch 'collectd-4.5'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 3 Jan 2009 00:36:04 +0000 (01:36 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 3 Jan 2009 00:36:04 +0000 (01:36 +0100)
commit02ea8fa749d3225f2e4dbb7e00198abc3990e523
tree8a63611e3a31816cae8fc37d93de763d85b84dea
parent24c93f543f999f261d27cfe174fc97ebb1d866e1
parenta30f785e3411091fceb2f5c850beb5067c18396d
Merge branch 'collectd-4.5'

Conflicts:

src/types.db.pod
src/types.db.pod