Merge branch 'ab/enable-i18n' into next
commit65af8cdcea0175b26f0f8c0b6a61c0f69d8c2a8c
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 00:42:08 +0000 (13 16:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 00:42:08 +0000 (13 16:42 -0800)
tree7ac493a0a69c8e4edf23ed2830d3b676b4d41549
parentb08445edb77b4b7f81c790d2d3f574d94859a645
parent5e9637c629702e3d41ad01d95956d1835d7338e0
Merge branch 'ab/enable-i18n' into next

* 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