[MERGE] : with trunk and resolve conflicts
authorajay javiya (OpenERP) <aja@tinyerp.com>
Tue, 1 Apr 2014 13:25:34 +0000 (18:55 +0530)
committerajay javiya (OpenERP) <aja@tinyerp.com>
Tue, 1 Apr 2014 13:25:34 +0000 (18:55 +0530)
commit7126bc5b500db52440f40cfe2ed7c1395ac3fcde
tree7c939b5e42be9be5a62355f9f90799b3dc82bfdd
parenteff3ce022ceaf2264220a1d4ec1990a482095d8a
parentcf139faeff60dd8191258ba7ff894a79a543faf0
[MERGE] : with trunk and resolve conflicts

bzr revid: aja@tinyerp.com-20140401132534-owbxvwqo6qpodw7e
addons/website_blog/controllers/main.py
addons/website_blog/views/website_blog_templates.xml