Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 20 Aug 2009 11:52:34 +0000 (13:52 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 20 Aug 2009 11:52:34 +0000 (13:52 +0200)
commit03aa21f08fede809f37a7443d3124fb9314f4dc8
tree5723165dc56886f75beb306204c11fe58d87af2b
parentdbbdb25542df6d9afbfddf78a3b1a8fee9029a80
parent17a04c7afcf44707f6bc45697212c1f8fc6aa761
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
src/apache.c
src/apache.c
src/bind.c
src/collectd.conf.in