[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Wed, 18 Jan 2012 10:12:52 +0000 (11:12 +0100)
committerVo Minh Thu <vmt@openerp.com>
Wed, 18 Jan 2012 10:12:52 +0000 (11:12 +0100)
commit75b3fc0907ee873c6e16d1fa8e8bfe58d4f520c1
tree3e7f7bbe9110eeae766b46bb9c16a867579b6452
parent3203d264aecd751a8c261cea4f72fa323a3098be
parent152f92916bc36d00c0e59fbc49fb655a4fd85908
[MERGE] merged trunk.

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