[MERGE] [FORWARD] Forward port of saas-2 branch until revision 9036 (revid tde@opener...
authorThibault Delavallée <tde@openerp.com>
Mon, 9 Dec 2013 10:50:31 +0000 (11:50 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 9 Dec 2013 10:50:31 +0000 (11:50 +0100)
commit4b96e85a306e2e0fb7a4365fc3688b430cef7dc6
tree9f868b28f24b711cd9dc2c719683f3e58debb47a
parent1e994bb667b0a88997649cab73fff3f98dc36dca
parent20be322c4571aae52863c32503c9e03da972e4b3
[MERGE] [FORWARD] Forward port of saas-2 branch until revision 9036 (revid tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v)

bzr revid: tde@openerp.com-20131209105031-17920wsidpqrwmxj
addons/account/account.py
addons/mail/mail_thread.py