Merge remote-tracking branch 'origin/geni-v3' into geni-v3
authorroot <root@devel.pl.sophia.inria.fr>
Thu, 16 Aug 2012 18:58:24 +0000 (20:58 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Thu, 16 Aug 2012 18:58:24 +0000 (20:58 +0200)
commitcdb2156adc15147639db8831eb027ab9c3b9d475
treec0e545c93a38bb8f8acdca554e238ac88c932122
parent7a541f733e84da2111bff988aaa4cd9b55bdfa2c
parent36787fe6c406e8d8a6ad5d8705a6b447bac20bf4
Merge remote-tracking branch 'origin/geni-v3' into geni-v3