Merge branch 'collectd-4.4'
authorFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)
committerFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)
commit089d33f1f455da115ca0c87160df8dbd49286377
tree508090a8a755738b5c7251b5d46103f73927adc7
parent5bf80d6ecad0e6684eb38cf2de8e56b4f6b50fe3
parent62430c784cf53c7dccb6fec021f9bb4c0d790a0f
Merge branch 'collectd-4.4'
src/collectd.conf.in
src/email.c
src/ntpd.c
src/utils_threshold.c