[MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552...
authorChristophe Simonis <chs@openerp.com>
Wed, 27 Nov 2013 11:12:08 +0000 (12:12 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 27 Nov 2013 11:12:08 +0000 (12:12 +0100)
commit0521d1aab34b3711a9b60cb1ebd6d15740a0848d
treece36918a85660c0ae1cded98bb7e219f455a87b0
parent354afeb8b5b633920ee1dfe07b6e3e763e14f32f
parent0d13df5a5703d71a987eabd0bd0d56b4148e17a2
[MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m

bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
addons/fleet/fleet.py
addons/mail/mail_thread.py
addons/mail/static/src/js/mail.js
addons/mrp_operations/test/workcenter_operations.yml
addons/procurement/schedulers.py