fix up merge conflicts to compile on strict settings
[systembsd.git] / AUTHORS
2014-06-05 kremlin-minor info errata