[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)
commit0870ff76a1ff2396a606d7fbfbe7ac1b2bbf8c80
tree1ec8c39d60d8766e1021e33438b010fe089576e3
parentf6629dfbbd497c544fcf02b43186f2d28d4ac926
parent4d242424cd13ade53498c12ed0a90975b1e0c864
[MERGE] Merge lp:openerp-web.

bzr revid: bth@tinyerp.com-20130218122223-reyc4zsyslxd2uec