Merge branch 'collectd-5.8'
[collectd.git] / src / mcelog.c
2016-12-25 Maryam Tahhanfixed rebase conflicts