Merge remote-tracking branch 'uclouvain/master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Thu, 30 Jul 2015 23:50:55 +0000 (01:50 +0200)
committermayeut <mayeut@users.noreply.github.com>
Thu, 30 Jul 2015 23:50:55 +0000 (01:50 +0200)
commit0a4ac0852afe7a43e52c48dc33bae126171f5f1e
treecc27075ab4716eb1d01a4a2c204534f1eb727ea0
parent60301842c75a87e9e742cb0860d257aae7fc1e70
parentdc34a6cc8cef7669a67177dd19a3854709e1ae92
Merge remote-tracking branch 'uclouvain/master' into coc-qcc