Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sun, 1 Apr 2012 10:07:20 +0000 (12:07 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 1 Apr 2012 10:07:20 +0000 (12:07 +0200)
commitab55c79a0fee35932995d9f492730dc131034d52
treee7babe5f494de86039454c19c955f15aec0a9e4f
parentefb97f730c570686269cc9b7545842162ff6af71
parentf1ba2733d2c58fed90c13e9ae31cb7c1f3c5613e
Merge branch 'collectd-5.0'
ChangeLog
configure.in
src/Makefile.am
src/collectd.conf.pod
src/libcollectdclient/client.c
src/processes.c
src/snmp.c
src/tcpconns.c
version-gen.sh