Merge branch 'js/i18n-scripts'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:16 +0000 (16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:16 +0000 (16:00 -0700)
* js/i18n-scripts:
  submodule: take advantage of gettextln and eval_gettextln.
  stash: take advantage of eval_gettextln
  pull: take advantage of eval_gettextln
  git-am: take advantage of gettextln and eval_gettextln.
  gettext: add gettextln, eval_gettextln to encode common idiom

1  2 
git-am.sh
git-pull.sh
git-submodule.sh

diff --cc git-am.sh
Simple merge
diff --cc git-pull.sh
Simple merge
Simple merge