Handle conflicts from git merge release-20160315
[tools/mic.git] / debian / copyright
2012-12-19 Gui ChenMerge branch 'release-0.15' into devel
2012-11-24 Ed BartoshIntegrated mic with "OTC Tools Tester" Jenkins machinery