Merge with 'origin/master' to resolve conflicts with #932 (stream)
[nit.git] / tests / base_conflict_submodule_name_submodule2 /
2011-04-02 Jean Privatcompile: cnames for classes and modules