Handle conflicts from git merge release-20160315
[tools/mic.git] / debian / compat
1 7