Merge branch 'collectd-5.5'

diff --cc src/apache.c
Simple merge

diff --cc src/daemon/common.c
index 8f22011,53c1f08..dfaa61a
--- 1/src/daemon/common.c
--- 2/src/daemon/common.c
+++ b/src/daemon/common.c
@@@ -46,8 -46,11 +46,10 @@@
  
  /* for getaddrinfo */
  #include <sys/types.h>
 -#include <sys/socket.h>
  #include <netdb.h>
  
+ #include <poll.h>
+ 
  #if HAVE_NETINET_IN_H
  # include <netinet/in.h>
  #endif

diff --cc src/statsd.c
Simple merge