[MERGE] Merged with web/trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 5 Jul 2012 08:43:48 +0000 (10:43 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 5 Jul 2012 08:43:48 +0000 (10:43 +0200)
commit13e1927070f36b177787437acedc255f29e17461
treeeb34304ddc33a96d6f76bab083f124b3b7d54458
parent864d0112006bfcb1914a1613927d7294c9037516
parent535f2350ce6bf88fd07d6cae352a72a14d75c379
[MERGE] Merged with web/trunk.

bzr revid: tde@openerp.com-20120703115456-udxhm22ma9w6ilz2
bzr revid: tde@openerp.com-20120704080543-ijo38i5ztwh6ee4w
bzr revid: tde@openerp.com-20120705084348-dcp6gvrkuwhi1c7f