Merge branch 'maint'
commit6517452d7a4269e9a34648a28b8931640299f458
authorJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 09:16:25 +0000 (25 02:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 09:16:25 +0000 (25 02:16 -0700)
tree8c9dabf3ae1ed7c974b78fb4ce0547557fc46358
parent8f5e3ca7d1d9c987c5a50934f1acdbad44163f3b
parent54bc13ce5300bf7c2237aba3fd123dd587e56d31
Merge branch 'maint'

* maint:
  t8005: Nobody writes Russian in shift_jis

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