Merge remote-tracking branch 'uclouvain/master'
authormayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:48:37 +0000 (20:48 +0200)
committermayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:48:37 +0000 (20:48 +0200)
commite526d435cc874b97ae41eacc6b8b0b72419180fb
treea52c243bc0d17afafc118c78774047a219c3e373
parent0b6a592372d6360ec64b8d1364b6ee56a1dd2a5f
parentf8c822266043a689055b44274c0bf4dc34d4c8ba
Merge remote-tracking branch 'uclouvain/master'