Code

Merged changes from trunk@315 to branches/collectd-quota
authorocto <octo>
Fri, 16 Dec 2005 10:33:59 +0000 (10:33 +0000)
committerocto <octo>
Fri, 16 Dec 2005 10:33:59 +0000 (10:33 +0000)
commit89693973e78ca3d1230a5c42e12c9488a1d2b99e
tree7a4e3ac3bde6652f4e3ca461fae888be6d5fd2d3
parent82c069dabfff10bb918dcd8e154612fe3baa870f
Merged changes from trunk@315 to branches/collectd-quota
src/Makefile.am
src/collectd.c
src/collectd.h