Merge branch 'mlsr/unixsock_getthreshold' of https://github.com/manuelluis/collectd
Merge branch 'master' of github.com:collectd/collectd