Merge branch 'tb/document-status-u-tradeoff' into maint

* tb/document-status-u-tradeoff: i18n: make the translation of -u advice in one go

Junio C Hamano committed Apr 12, 2013 at 08:12 UTC 5234b41f68ca1ab788513fdc059f9f2e01fd3f6e

No changes.