Merge branch '2.7.x'

git/hooks/prepare-forward-merge

@@ -38,9 +38,9 @@ def rewrite_message(message_file, fixed)
       if from_branch.include? "/"
         from_branch = from_branch.partition("/").last
       end
-      to_brach = match[2]
+      to_branch = match[2]
       $log.debug "Rewriting merge message"
-      line = "Merge branch '#{from_branch}'" + (to_brach ? " into #{to_brach}\n" : "\n")
+      line = "Merge branch '#{from_branch}'" + (to_branch ? " into #{to_branch}\n" : "\n")
     end
     if fixed and line.start_with?("#")
       $log.debug "Adding fixed"