Merge branch 'master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Tue, 13 Oct 2015 19:57:58 +0000 (21:57 +0200)
committermayeut <mayeut@users.noreply.github.com>
Tue, 13 Oct 2015 19:57:58 +0000 (21:57 +0200)
commitc8d03fea9b2d1db0f2000718395a9f01c59a1e2f
tree15e23aa0dd63ced748d850be0421600ee014f83e
parent3259fe2ff86637d956715e1f6e7f18b1acf4a30f
parent6721f8a53fec2ad30d15b142968ab9c8e2e6ba1c
Merge branch 'master' into coc-qcc