[MERGE] Merge with main branch
authorpso (OpenERP) <pso@tinyerp.com>
Sun, 22 Jul 2012 08:21:52 +0000 (13:51 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Sun, 22 Jul 2012 08:21:52 +0000 (13:51 +0530)
commit8be94b1e93772f34339175324f9dc3ed6aa6e21b
tree8372a1df7bf29a2f076faad8584d965367d4e0a5
parente85181b2ec5104833a652c460a136616117b98dd
parent61f361bfee1ae021aedef0ebbf3c91d15083cf1a
[MERGE] Merge with main branch

bzr revid: pso@tinyerp.com-20120722082152-l24vpuuxjb34126g
addons/account/i18n/account.pot
addons/base_calendar/base_calendar.py
addons/base_calendar/wizard/base_calendar_invite_attendee.py
addons/hr/hr.py
addons/sale/i18n/sale.pot