Merge branch 'jk/ambiguous-short-object-names'

A test fixup to recently graduated topic. * jk/ambiguous-short-object-names: t1512: become resilient to GETTEXT_POISON build

Junio C Hamano committed Oct 26, 2016 at 13:14 UTC caabffaf375d0f4b9195a04e9141852229ee5aee

No changes.