[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 07:52:58 +0000 (09:52 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 07:52:58 +0000 (09:52 +0200)
commit936a2efa46335515658da3de0170200fedb7ec3d
tree918146eefe6365679727ea703a023a8a6304b0e2
parent0c45b4763c761641f81b5ad6de4fa917fbf9eb69
parentcd04752f66d238e7eaa5277f4102c7e8849cd684
[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120814075258-52pwvh03fl5fjkqg