Merge branch 'master' into merge/collectd-4
[collectd.git] / src / liboconfig / AUTHORS