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)
commit3b473acc5d4d27e5cf5101a4b8cc8a21c2bb7262
tree9040e30bfd54f3ec458a2d3aeb3237b17064361b
parent09a1be15c27716ea984039b55ceddba3a0ef388b
parent59c7ee1cafaf53814838794908dd84f8101334c7
Merge branch 'collectd-5.0'

Conflicts:
src/amqp.c

Change-Id: I85ab3ee2b51830ad0b5d474cf1f18b5c828d6588
src/bind.c