[MERGE] Sync with upstream (saas-4)
authorThibault Delavallée <tde@openerp.com>
Fri, 9 May 2014 12:47:11 +0000 (14:47 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 9 May 2014 12:47:11 +0000 (14:47 +0200)
commitad65e32cc24b7d181fe37e4ebaf95e15b7e118ae
tree64fd90565aad62e17534f5cd87e6188d90b6d5db
parent59b9344babaacfbf345ad48df495dc839bd0779c
parent0826340b8a761bec3ca5279a9537d8738f40ae1d
[MERGE] Sync with upstream (saas-4)

bzr revid: tde@openerp.com-20140507090057-24hacfi1jxs6ob5g
bzr revid: tde@openerp.com-20140509124711-v82rqm57nyc0jlcm