Merge branch 'master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Thu, 17 Sep 2015 00:12:27 +0000 (02:12 +0200)
committermayeut <mayeut@users.noreply.github.com>
Thu, 17 Sep 2015 00:12:27 +0000 (02:12 +0200)
commit4bb5e24d234dbf239119524edae4e23f39de7ee4
tree4f354880eb794d70ed20edde5ebba693f48092aa
parent66d890bf225a4edc49658803b4aa6a65031479e4
parent6cb56b36f627194fdfb13e306d27925b956af63f
Merge branch 'master' into coc-qcc