Merge remote-tracking branch 'uclouvain/master' into issue-235
authormayeut <mayeut@users.noreply.github.com>
Mon, 20 Jul 2015 22:20:05 +0000 (00:20 +0200)
committermayeut <mayeut@users.noreply.github.com>
Mon, 20 Jul 2015 22:20:05 +0000 (00:20 +0200)
commit1bbb6070691ef40803a781610483892cb5984b69
tree7f5bead8fec5c248fc944bce66713b0b116935c6
parent775ee877761e3768f615b40729520b632c128645
parentfd1f7cf297cd1adcdc858dfe6bdd493c5c510a33
Merge remote-tracking branch 'uclouvain/master' into issue-235