Code

Merge branch 'master' into ff/netlib
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 19 Aug 2010 13:03:22 +0000 (15:03 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 19 Aug 2010 13:06:00 +0000 (15:06 +0200)
commit6624c959628fa1188f8cfa4789da1eccccc5f5e4
tree2a40211fcb20744a59596314df8703752aff4fff
parentd866effbc50aef27811aac113ef2619da7fc6b43
parentd1c3baabf0c7bf65f699fb66db5b2aea92d1f5e7
Merge branch 'master' into ff/netlib

Conflicts:
src/collectdctl.c
configure.in
src/Makefile.am
src/collectd-nagios.c
src/collectdctl.c