[IMP] merge with latest trunk
authorRandhir Mayatra rma-openerp <rma@tinyerp.com>
Wed, 23 Apr 2014 12:59:05 +0000 (18:29 +0530)
committerRandhir Mayatra rma-openerp <rma@tinyerp.com>
Wed, 23 Apr 2014 12:59:05 +0000 (18:29 +0530)
commit3d226bf50fac248d9f9664c5aac3df2566e1bdcc
tree95277cde37e6c407232113a215b5cfd8d7161599
parenta8e2cf30069246e90d0e06fc42fe6b64f2e1cfa2
parent8ee8b7bde68a550e2950df75754ad387c8ae13b1
[IMP] merge with latest trunk

bzr revid: rma@tinyerp.com-20140423125905-yw05utqtg8q4r0kv
addons/web/controllers/main.py