Merge branch 'collectd-4.4'

Conflicts:

	src/snmp.c

diff --cc src/collectd.h
Simple merge

diff --cc src/configfile.c
Simple merge

diff --cc src/ntpd.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/snmp.c
index 0561257,460624b..07465dd
--- 1/src/snmp.c
--- 2/src/snmp.c
+++ b/src/snmp.c
@@@ -715,12 -714,8 +715,12 @@@ static value_t csnmp_value_list_to_valu
      temp = (uint32_t) vl->val.counter64->high;
      temp = temp << 32;
      temp += (uint32_t) vl->val.counter64->low;
-     DEBUG ("snmp plugin: Parsed int64 value is %llu.", temp);
+     DEBUG ("snmp plugin: Parsed int64 value is %"PRIu64".", temp);
    }
 +  else if (vl->type == ASN_OCTET_STR)
 +  {
 +    /* We'll handle this later.. */
 +  }
    else
    {
      WARNING ("snmp plugin: I don't know the ASN type `%i'", (int) vl->type);

diff --cc src/vserver.c
Simple merge