Handle conflicts from git merge release-20160315
[tools/mic.git] / .gbp.conf
2014-02-28 Gui Chenpackaging: use gbp packaging service