Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 09:16:25 +0000 (02:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 09:16:25 +0000 (02:16 -0700)
* maint:
  t8005: Nobody writes Russian in shift_jis

Conflicts:
t/t8005-blame-i18n.sh

1  2 
t/t8005-blame-i18n.sh

Simple merge