[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 25 Mar 2014 09:02:09 +0000 (10:02 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 25 Mar 2014 09:02:09 +0000 (10:02 +0100)
commit7185a687752bdbf37e2430c67ccc78cb8eef0ab1
treeeaf0bd52746de5737e8c1093aff4d7bbefaef72d
parent7945d4bb9719bb3af52a1b112757a8d47a48d669
parentc2e7a69ebaa378e290df64cd4d144669e24a602c
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu
addons/mail/static/src/js/mail.js
addons/purchase/purchase.py