Merge branch 'jx/i18n-more-marking' into maint

* 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 16, 2012 at 13:59 UTC e6d88ca87cbb3d89d639a3ee769486f44f9a33b8

No changes.