Merge branch 'master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Thu, 8 Oct 2015 17:11:52 +0000 (19:11 +0200)
committermayeut <mayeut@users.noreply.github.com>
Thu, 8 Oct 2015 17:11:52 +0000 (19:11 +0200)
commit3259fe2ff86637d956715e1f6e7f18b1acf4a30f
tree571cdd4a5d1015ca79e03e9adcfb79859e707103
parent2dab5fed591d19a3295b42225701801ee52569fb
parentbbef2a9da3167646b452fe77983e33bf0596439e
Merge branch 'master' into coc-qcc