[MERGE] Merge lp:openerp-web.
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Mon, 18 Feb 2013 12:22:23 +0000 (17:52 +0530)
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Mon, 18 Feb 2013 12:22:23 +0000 (17:52 +0530)
bzr revid: bth@tinyerp.com-20130218122223-reyc4zsyslxd2uec


Trivial merge