Merged revisions 317 and 318 from trunk to the branches
authorocto <octo>
Fri, 16 Dec 2005 12:46:43 +0000 (12:46 +0000)
committerocto <octo>
Fri, 16 Dec 2005 12:46:43 +0000 (12:46 +0000)
commit5f5ee0f5d7ac77ab45acc08180375f387e7476b0
tree1e5685f52ef111221f3e0afbf205313f2baa50cf
parentdd649add65ed822ac98a084d09086b2bb7361b72
Merged revisions 317 and 318 from trunk to the branches
Makefile.am
configure.in
debian/changelog
src/collectd.c
src/collectd.pod