[MERGE] forward port of branch saas-4 up to revid 9365 chs@openerp.com-20140422143249...
authorChristophe Simonis <chs@openerp.com>
Tue, 22 Apr 2014 14:49:33 +0000 (16:49 +0200)
committerChristophe Simonis <chs@openerp.com>
Tue, 22 Apr 2014 14:49:33 +0000 (16:49 +0200)
commit618fbde36f2dc4797f68906ab105f8c0ecd59169
tree6d303e31e96a49e1fc9f515cdf4618b70b9ad2ed
parentb97ac5b559f63159abb6fbf53a35f753b7e6b525
parent12beacda08dd023c1590ecbedcb76f305695e251
[MERGE] forward port of branch saas-4 up to revid 9365 chs@openerp.com-20140422143249-3cfh18tenn3a5ry1

bzr revid: chs@openerp.com-20140422144651-840zze7p5549k88s
bzr revid: chs@openerp.com-20140422144933-0su8g7pgrcloijco
addons/website_forum/controllers/main.py
addons/website_forum/views/website_forum.xml
openerp/addons/base/ir/ir_ui_view.py