[MERGE] merge with latest trunk
authorRandhir Mayatra rma-openerp <rma@tinyerp.com>
Mon, 7 Apr 2014 10:02:40 +0000 (15:32 +0530)
committerRandhir Mayatra rma-openerp <rma@tinyerp.com>
Mon, 7 Apr 2014 10:02:40 +0000 (15:32 +0530)
commitc037ebb362cf196edabc07a7e40c85a15a51eb27
tree8cbd28cdc85d9c3a3fb6d172297d3376d375f0a1
parent8c666af35c9c7b79373b999d1df2d4ba350e8f5d
parent7c79674a3ec2ce1e58e8edca889d2175813a4793
[MERGE] merge with latest trunk

bzr revid: rma@tinyerp.com-20140407100240-vk43kganr5g0gz5i
addons/web/controllers/main.py