[MERGE} from trunk
[odoo/odoo.git] / doc / test-framework.rst
2012-03-05 Vo Minh Thu[DOC] moved FEATURES.rst to doc/.