Merge branch 'ab/i18n' into ab/test-1
commit7e7b4f71b5a39eb300da4af64b6f08cfe5eadff9
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 20:53:30 +0000 (18 13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 20:53:30 +0000 (18 13:53 -0700)
treea8d6fed3948c7a9ebc017d03af807572f35f987c
parent9b777a165e050f9a881a74a5902a8ddd2de30da5
parent44d3770f38f399962946f2a16e492a9d81c4665d
Merge branch 'ab/i18n' into ab/test-1

* ab/i18n:
  tests: locate i18n lib&data correctly under --valgrind
  gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
  tests: rename test to work around GNU gettext bug
  Add infrastructure for translating Git with gettext

Conflicts:
Makefile
.gitignore
INSTALL
Makefile
fast-import.c
git.c
imap-send.c
t/test-lib.sh
upload-pack.c