[MERGE] manifests: added descriptions.
authorVo Minh Thu <vmt@openerp.com>
Mon, 28 Nov 2011 13:37:18 +0000 (14:37 +0100)
committerVo Minh Thu <vmt@openerp.com>
Mon, 28 Nov 2011 13:37:18 +0000 (14:37 +0100)
bzr revid: vmt@openerp.com-20111128133718-gu79b47hkoqeyv0u

1  2 
addons/web/__openerp__.py
addons/web_rpc/__openerp__.py

Simple merge
Simple merge