From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 25 Jul 2009 09:16:25 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6517452d7a4269e9a34648a28b8931640299f458;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  t8005: Nobody writes Russian in shift_jis

Conflicts:
	t/t8005-blame-i18n.sh
---

6517452d7a4269e9a34648a28b8931640299f458