Merge branch 'ef/non-ascii-parse-options-error-diag' into maint

* ef/non-ascii-parse-options-error-diag: parse-options: report uncorrupted multi-byte options

Junio C Hamano committed Feb 27, 2013 at 10:04 UTC 6f0c33666300ccf95eb4b4e723e07a3c588d12db

No changes.