Merge branch 'jx/i18n-more-marking'

* jx/i18n-more-marking: i18n: format_tracking_info "Your branch is behind" message i18n: git-commit whence_s "merge/cherry-pick" message

Junio C Hamano committed Feb 7, 2012 at 12:56 UTC 6f1ede842351ee6c822b7904a9d55a6720992aa8

No changes.