[MERGE] openerp-web.
authorVaibhav (OpenERP) <vda@tinyerp.com>
Wed, 21 Sep 2011 05:02:26 +0000 (10:32 +0530)
committerVaibhav (OpenERP) <vda@tinyerp.com>
Wed, 21 Sep 2011 05:02:26 +0000 (10:32 +0530)
bzr revid: vda@tinyerp.com-20110921050226-53g26gw9zoyx4pvd


Trivial merge