[MERGE] merge with latest trunk
authorRandhir Mayatra rma-openerp <rma@tinyerp.com>
Fri, 11 Apr 2014 06:18:43 +0000 (11:48 +0530)
committerRandhir Mayatra rma-openerp <rma@tinyerp.com>
Fri, 11 Apr 2014 06:18:43 +0000 (11:48 +0530)
commita8e2cf30069246e90d0e06fc42fe6b64f2e1cfa2
treef33bb4203334f53ac0d87a11bf4d61834d5009d1
parentc037ebb362cf196edabc07a7e40c85a15a51eb27
parent60f74ff3f4c7bb1e5208b0f4be3ef2577a5645f4
[MERGE] merge with latest trunk

bzr revid: rma@tinyerp.com-20140411061843-kxugxk0p63ifkjg7
addons/web/controllers/main.py