Merge branch 'collectd-4.6'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 17 Apr 2009 23:06:23 +0000 (01:06 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 17 Apr 2009 23:06:23 +0000 (01:06 +0200)
commitcfb86a0f119d0ee0e72a920ba1251bb0350cf08b
tree4ad3bb0d463aac8aa012057550c973c34bd9a0e6
parent5f2f461a0a08fb6f36762b59423c38b9315755b8
parent9b626288aff81c68fe19210a58b4a32eeefde9d3
Merge branch 'collectd-4.6'

Conflicts:
src/mysql.c
src/ping.c
src/mysql.c