[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)
bzr revid: tde@openerp.com-20131209105031-17920wsidpqrwmxj

1  2 
addons/account/account.py
addons/mail/mail_thread.py

Simple merge
Simple merge