Merge branch 'nd/am-i18n-fix'
commite245397434f8d26bf18053823c3fb9d1374679bd
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:09:04 +0000 (7 11:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:09:04 +0000 (7 11:09 -0700)
tree286620eaf35b17ab5df0a7d4e8fe42d51a2b79fd
parent7fe136d78f5db3317ebf60115c1d7faa87412d6a
parenta312a271b92fe74f5954adbb824987b040926c4c
Merge branch 'nd/am-i18n-fix'

"git am" wasn't marked up for i18n properly.

* nd/am-i18n-fix:
  am: quote string for translation before passing to eval_gettextln
git-am.sh