[Merge] Merge with main branch.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 5 Jun 2012 12:56:54 +0000 (18:26 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 5 Jun 2012 12:56:54 +0000 (18:26 +0530)
commit9698e2c71ad34c24b750b34415b61d593fa7f6f4
tree455ee02553b8573def4dce6480dc748f0bd229db
parentc9260da9cd1adcd173d4d210b4faf78743a2e43b
parentcfce82898b0d927752b5f70fd7a729c4f63537a0
[Merge] Merge with main branch.

bzr revid: mdi@tinyerp.com-20120605125654-1thm2jz4lbbet5oh
addons/account/i18n/zh_TW.po
addons/project/project_view.xml
addons/sale/sale_view.xml