[MERGE] with trunk
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Thu, 13 Jun 2013 07:14:22 +0000 (12:44 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Thu, 13 Jun 2013 07:14:22 +0000 (12:44 +0530)
commit09c62b0d02ae59035b1ea70eac75a5612c5d32a4
tree07489726a38ba556d26b3ae7c82bed8a328a405a
parente23b3de7ec5b65fdcbc96ea5ce0f705ffe500e42
parentb671bad849ac37eba49cdb1cc13197fbdcbc3e66
[MERGE] with trunk

bzr revid: fka@tinyerp.com-20130613071422-9iw22gkm33epbkpb
addons/account/account.py
addons/base_calendar/base_calendar.py
addons/base_calendar/crm_meeting.py
addons/hr_payroll/hr_payroll.py
addons/mail/mail_alias.py
addons/product/product.py
addons/project/project.py
addons/project/project_demo.xml
addons/project/project_view.xml
addons/project_issue/project_issue_view.xml
addons/subscription/subscription.py