[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 16 Jan 2012 11:06:31 +0000 (12:06 +0100)
committerVo Minh Thu <vmt@openerp.com>
Mon, 16 Jan 2012 11:06:31 +0000 (12:06 +0100)
commit3203d264aecd751a8c261cea4f72fa323a3098be
tree93cdf7c89795b809963ef08a68d84d293cf41a7a
parent1497062ba1dbfd814c69fa4250c4eb6a09a5206a
parent064a50bcde5f1c65a17f4feb42348b5809081085
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120116110631-lrzp6uxsjki7by22
addons/web/common/http.py
addons/web/controllers/main.py