Code

Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sat, 25 Feb 2012 17:16:59 +0000 (18:16 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 25 Feb 2012 17:16:59 +0000 (18:16 +0100)
Conflicts:
src/amqp.c

Change-Id: I85ab3ee2b51830ad0b5d474cf1f18b5c828d6588

1  2 
src/bind.c

diff --cc src/bind.c
Simple merge