[MERGE] --proxy mode added, using Werkzeug ProxyFix class.
authorVo Minh Thu <vmt@openerp.com>
Fri, 10 Feb 2012 15:35:00 +0000 (16:35 +0100)
committerVo Minh Thu <vmt@openerp.com>
Fri, 10 Feb 2012 15:35:00 +0000 (16:35 +0100)
bzr revid: vmt@openerp.com-20120210153500-689bnj0a1f51nvjc


Trivial merge