merge
authorpap (openerp) <pap@tinyerp.co.in>
Wed, 21 Jul 2010 08:53:45 +0000 (14:23 +0530)
committerpap (openerp) <pap@tinyerp.co.in>
Wed, 21 Jul 2010 08:53:45 +0000 (14:23 +0530)
commitc976542d8f428df27a2a41eb49da7d0e6b8b882a
tree3c36bbb3fcfdea7e43baa817bdf28ff4b6731214
parent83c655c8dc58b5435523dc0ac078f6ae190e9ba3
parente1778d7bc72155e0b1db02871f5bbabae5a0449d
merge

bzr revid: pap@tinyerp.co.in-20100721084846-ccj0hs7a9s629xdd
bzr revid: pap@tinyerp.co.in-20100721085345-9wkqd3trnlhizbia
addons/account/project/analytic_account_demo.xml
addons/project/test/test_project_delegation.yml