psi (Open ERP) 794c39d803 [MERGE] merge with mtr's branch ... bzr revid: psi@tinyerp.co.in-20110323084226-n1wm534d0hso6n90 bzr revid: psi@tinyerp.co.in-20110323101135-iidb0qlg4zk97t9a bzr revid: psi@tinyerp.co.in-20110323101358-29ejnjid6wn72meq		2011-03-23 15:43:58 +05:30
..
i18n	[MERGE] merge with mtr's branch	2011-03-23 15:43:58 +05:30
security	merged with trunk	2010-12-30 15:28:09 +05:30
test	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	[MERGE] Resynchronized with trunk.	2011-03-25 11:24:13 +01:00
mrp_subproduct.py	merged with trunk	2010-12-30 15:28:09 +05:30
mrp_subproduct_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30