[MERGE] Merged with web/trunk.
authorThibault Delavallée <tde@openerp.com>
Wed, 11 Jul 2012 09:56:36 +0000 (11:56 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 11 Jul 2012 09:56:36 +0000 (11:56 +0200)
commit14946ef758f9c86ebf893abbc8d730a45b116c37
tree32c00877c0da9fa788fec615329d4251c91cdbf4
parent7ba80c40a09295154c6123c0e23ee3ad326579fb
parenta3b2a4e99702a1b0aa53ec38150cb6a84df1df2c
[MERGE] Merged with web/trunk.

bzr revid: tde@openerp.com-20120711095636-gq3whaia3vm3n2lx