Merge remote-tracking branch 'alexandre/master' into master
[nit.git] / tests / base_conflict_submodule_name.nit
2011-04-02 Jean Privatcompile: cnames for classes and modules