[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Wed, 14 May 2014 07:27:20 +0000 (09:27 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 14 May 2014 07:27:20 +0000 (09:27 +0200)
commit0d49bbb8e0388f7a9ebe3a8358c0eb2e7fb5504f
treebd5c4a811541d8731cd691d5af945e07ada3e741
parentc3cfc4bc32db1567c774632770b7d413dcf2c973
parenta6f036d43fced59654770f6c30cca8581009cf2b
[MERGE] upstream
addons/website_forum/controllers/main.py