[MERGE] Merged with web/trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 12 Jul 2012 08:16:14 +0000 (10:16 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 12 Jul 2012 08:16:14 +0000 (10:16 +0200)
commit66c969e3269ea06c453f37a1096fa9c6bbd161de
tree89078cc60280906de409e7004af8f20b756b11c4
parent5a0b486e129a70d785c416dadeb10367c4bfc78a
parent30c39193163e3cedb060cdac2738765d45c07be0
[MERGE] Merged with web/trunk.

bzr revid: tde@openerp.com-20120712081614-t1cv6wmisvaeeae4