Code

Merge branch 'collectd-4.2'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:28:51 +0000 (18:28 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:28:51 +0000 (18:28 +0100)
commitc88e459eb3823b766fc3a9ed37f25bc1f630146c
tree1946eb93af4c585bbeef352e39c69ac5cd3afed9
parentb6813a972bf80e6bf4725a63be7270d5beb834e5
parent0b88f6888705e92ce4472435a464730cf2ce2d5a
Merge branch 'collectd-4.2'
src/logfile.c
src/network.c