[MERGE] forward port of branch 8.0 up to fc329b6
authorJeremy Kersten <jke@odoo.com>
Tue, 18 Nov 2014 10:52:25 +0000 (11:52 +0100)
committerJeremy Kersten <jke@odoo.com>
Tue, 18 Nov 2014 10:52:25 +0000 (11:52 +0100)
commiteea50670fa6f53949594bfc8e3b1eb8eb3c0cee9
treec54c3dd1b12b088aa71ede20783ff32b4a715ea3
parent7a7bf11e92ffdd2de06e444ddc77aeb528ed4764
parentfc329b6eeb5652487c67e7b558fccaf46c3dad43
[MERGE] forward port of branch 8.0 up to fc329b6
addons/website_forum/controllers/main.py
addons/website_forum/models/forum.py