Merge branch 'master' into sr/pf
[collectd.git] / src / liboconfig / AUTHORS