Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 18:33:54 +0000 (20:33 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 18:33:54 +0000 (20:33 +0200)
1  2 
src/libcollectdclient/client.c
src/ping.c
src/utils_db_query.c

Simple merge
diff --cc src/ping.c
Simple merge
Simple merge