Merge branch 'master' into coc-qcc 551/head
authormayeut <mayeut@users.noreply.github.com>
Wed, 21 Oct 2015 18:45:50 +0000 (20:45 +0200)
committermayeut <mayeut@users.noreply.github.com>
Wed, 21 Oct 2015 18:45:50 +0000 (20:45 +0200)
commite975ca2832ecb012c1bd768c5d971eeb6032cbc4
treed662c67cf689692b432d2bdf5d7d29fca7a29a62
parent80be580d50c5defd2f4628b9c4ae3dad4e7c6ef0
parentb06bed7b7bcf73a3a282d8206ac526689685ce8d
Merge branch 'master' into coc-qcc