Merge branch 'collectd-4.6'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:49:33 +0000 (19:49 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:49:33 +0000 (19:49 +0100)
commitf413a3a8faa8e65cf79d45b2b518add78612e75c
tree7c5b1f9284f585c790a09471c7cf6db46f03d957
parentbc6d4a212c4c495028a11e2fdd091f5a736b9804
parent59f7ea301bbcc9d392cd5866e637a7d5087989cd
Merge branch 'collectd-4.6'

Conflicts:

src/bind.c
src/bind.c