Merge branch 'collectd-5.3' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Sat, 6 Sep 2014 09:27:56 +0000 (11:27 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Sep 2014 09:27:56 +0000 (11:27 +0200)
Conflicts:
src/curl.c

1  2 
src/curl.c

diff --cc src/curl.c
Simple merge