      %span
        - branch = commit_default_branch(@project, @branches)
        = link_to(branch, project_tree_path(@project, branch))
-@@ -49,6 +49,8 @@
-         = link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand")
+       - if @branches.any?
+-        and in
+-        = link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand")
++        とその他
++        = link_to("#{@branches.count}つの", "#", class: "js-details-expand")
          %span.js-details-contain.hide
            = commit_branches_links(@project, @branches)
 +    %span.cgray

   = link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")
 = render 'note_message'
 
diff -urN gitlab-rails.bk/app/views/notify/note_issue_email.html.haml gitlab-rails/app/views/notify/note_issue_email.html.haml
--- gitlab-rails.bk/app/views/notify/note_issue_email.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/notify/note_issue_email.html.haml	2014-03-22 09:00:00.000000000 +0900

diff -urN gitlab-rails.bk/app/views/projects/commit/_commit_box.html.haml gitlab-rails/app/views/projects/commit/_commit_box.html.haml
--- gitlab-rails.bk/app/views/projects/commit/_commit_box.html.haml	2014-03-22 09:00:00.000000000 +0900
+++ gitlab-rails/app/views/projects/commit/_commit_box.html.haml	2014-03-22 09:00:00.000000000 +0900
@@ -7,48 +7,50 @@
     .pull-left.btn-group
       %a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
         %i.icon-download-alt
