[MERGE] Forward-port of saas-4 up to fa739ac

diff --cc addons/website/models/ir_http.py
index 44b3f77,75a665f..8be35f5
--- 1/addons/website/models/ir_http.py
--- 2/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@@ -69,12 -60,7 +69,11 @@@ class ir_http(orm.AbstractModel)
                  if path[1] in langs:
                      request.lang = request.context['lang'] = path.pop(1)
                      path = '/'.join(path) or '/'
 +                    if request.lang == request.website.default_lang_code:
 +                        # If language is in the url and it is the default language, redirect
 +                        # to url without language so google doesn't see duplicate content
 +                        return request.redirect(path + '?' + request.httprequest.query_string)
                      return self.reroute(path)
-                 return self._handle_exception(code=404)
          return super(ir_http, self)._dispatch()
  
      def reroute(self, path):

diff --cc addons/website_forum/controllers/main.py
index f20a0b1,346445f..89c4a33
--- 1/addons/website_forum/controllers/main.py
--- 2/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@@ -208,7 -208,7 +208,7 @@@ class WebsiteForum(http.Controller)
              }, context=context)
          return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), new_question_id))
  
-     @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0])]"):question>'''], type='http', auth="public", website=True)
 -    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0]),('parent_id','=',False)]"):question>'''], type='http', auth="public", website=True, multilang=True)
++    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0]),('parent_id','=',False)]"):question>'''], type='http', auth="public", website=True)
      def question(self, forum, question, **post):
          cr, uid, context = request.cr, request.uid, request.context
          # increment view counter

diff --cc openerp/http.py
Simple merge