Handle conflicts from git merge release-20160315
[tools/mic.git] / debian / docs
1 README.rst
2 doc/RELEASE_NOTES