[MERGE] : with trunk
authorajay javiya (OpenERP) <aja@tinyerp.com>
Wed, 26 Mar 2014 05:48:41 +0000 (11:18 +0530)
committerajay javiya (OpenERP) <aja@tinyerp.com>
Wed, 26 Mar 2014 05:48:41 +0000 (11:18 +0530)
commit864892d6cee4bfe1971ca7cb1c5544dfa5e6e8ca
tree2be542aa35ec5405e3046e6ddddb886dfbc8f238
parent52e527c51889a9df22be47f6add712cff8959c95
parent0d4d9af5f4b7ca695e33af370848350b437c132e
[MERGE] : with trunk

bzr revid: aja@tinyerp.com-20140326054841-9yoaub8fw058vjkm
addons/website/controllers/main.py
addons/website_blog/controllers/main.py