Merge branch 'jx/i18n-more-marking'
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 Feb 2012 20:56:54 +0000 (12:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Feb 2012 20:56:54 +0000 (12:56 -0800)
* jx/i18n-more-marking:
  i18n: format_tracking_info "Your branch is behind" message
  i18n: git-commit whence_s "merge/cherry-pick" message


Trivial merge