[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Wed, 19 Mar 2014 08:48:17 +0000 (09:48 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 19 Mar 2014 08:48:17 +0000 (09:48 +0100)
commitc04e2f41ce4c46408c01c234a2617aaecb848daa
tree3bd74c5d9488153bbd9edb339515f74afc3b4dad
parent44e8722cc3f1ffbe55795178001f30f9a3cfc2c7
parentedf0f26d5963a5a9736d9358bbf37b9fd7b9d5d7
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140319084817-v82juqdl2mxq7jee