[MERGE] forward port of branch saas-3 up to 5bd0249
authorDenis Ledoux <dle@odoo.com>
Thu, 18 Sep 2014 14:18:23 +0000 (16:18 +0200)
committerDenis Ledoux <dle@odoo.com>
Thu, 18 Sep 2014 14:18:23 +0000 (16:18 +0200)
1  2 
addons/account_anglo_saxon/invoice.py
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/mail/static/src/js/mail.js
addons/web_kanban/static/src/js/kanban.js

Simple merge
Simple merge