[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Fri, 26 Aug 2011 07:39:04 +0000 (09:39 +0200)
committerVo Minh Thu <vmt@openerp.com>
Fri, 26 Aug 2011 07:39:04 +0000 (09:39 +0200)
commit6d5b0edf34662440bad740d79240b3f5ed2bfad4
tree9db20ea42691955f1aadc69cad5d2c26fb8d2094
parente28b8e56ba0c3df3acb930685a3d6a450961bfb1
parente7d06fc3d69c51a50bb5287bf2ff1fc81f977e6d
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110826073904-kpr0zvgmmcttimto
addons/crm/crm.py
addons/crm_partner_assign/test/test_crm_partner_assign.yml