[MERGE] Merged with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 18:33:24 +0000 (20:33 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 18:33:24 +0000 (20:33 +0200)
commit594f5a4ffe4f874fd448d0ee52ee6872c2e81355
treeee593dd1214b1f83f0fdd584934e746cd27b7b61
parentc8560f60292dd738ca3902f920adf72fbeff938b
parent7290d5880d7c5c34c8341ba893d062b0c91739a9
[MERGE] Merged with server/trunk.

bzr revid: tde@openerp.com-20120814183324-d2eza8ffbud1ewvn