Handle conflicts from git merge release-20160315
[tools/mic.git] / packaging /
drwxr-xr-x   ..
-rw-r--r-- 15779 mic.changes
-rw-r--r-- 2692 mic.spec