Code

Merge branch 'collectd-4.7'
authorFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Mon, 6 Jul 2009 11:45:41 +0000 (13:45 +0200)
committerFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Mon, 6 Jul 2009 11:45:41 +0000 (13:45 +0200)
commitfa9fd186f4e09c24a02d9541c2409d21bf282087
tree720503650b0838125cee8be2ea21cd2d29124e67
parentdd07b5921abe3ad07dffa189a7f3436a8c51b825
parentb3bfb951c73ea3d232e0e97a42479a5e3310125d
Merge branch 'collectd-4.7'
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod
src/common.c
src/dns.c
src/gmond.c
src/java.c
src/libcollectdclient/client.c
src/utils_cache.c