[MERGE] Merge from trunk-wms
authorJosse Colpaert <jco@openerp.com>
Wed, 12 Mar 2014 12:34:34 +0000 (13:34 +0100)
committerJosse Colpaert <jco@openerp.com>
Wed, 12 Mar 2014 12:34:34 +0000 (13:34 +0100)
commit8c493785275a84aff3033226261c82599dbb56b0
tree59cd7d040d6ad5a39b460b7793ab384504dfaece
parentc5a8943ebbf535792f505040d7d0c3a1d8fbb343
parent881577bd87ff130e9f1e50fa9fdd5616b8273db9
[MERGE] Merge from trunk-wms

bzr revid: jco@openerp.com-20140312123434-c6je2o30w3tmtez9
addons/mail/mail_thread.py
addons/stock/stock.py