Merge branch 'ab/enable-i18n'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:06:41 +0000 (16:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:06:41 +0000 (16:06 -0800)
commit2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40
tree3753154d3da34ff50e82a667a75ad56437d4d12f
parent85878dd0c929dde5d91411b57ef9f2d696cbc7d8
parent5e9637c629702e3d41ad01d95956d1835d7338e0
Merge branch 'ab/enable-i18n'

* ab/enable-i18n:
  i18n: add infrastructure for translating Git with gettext

Conflicts:
Makefile
Makefile
fast-import.c
git.c
http-fetch.c
http-push.c
imap-send.c
t/test-lib.sh