[MERGE] Sync with upstram: trunk-website-forum-tpa
authorThibault Delavallée <tde@openerp.com>
Thu, 10 Apr 2014 08:04:59 +0000 (10:04 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 10 Apr 2014 08:04:59 +0000 (10:04 +0200)
bzr revid: tde@openerp.com-20140410080459-b5ngtlg34dblbtyr

1  2 
addons/website_forum/controllers/main.py
addons/website_forum/views/website_forum.xml