[MERGE] Merged with addons/trunk.
[odoo/odoo.git] / doc / o2m.txt
2012-09-28 Xavier Morel[ADD] some import doc