[Merge] lp:~nobuto/ubuntu/vivid/unzip/fallback-encoding into lp:ubuntu/unzip

[Aron Xu]

Review: Needs Fixing

Current merge proposal has quite some noise from quilt, can you clean them up a bit?
-- 
https://code.launchpad.net/~nobuto/ubuntu/vivid/unzip/fallback-encoding/+merge/258824
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~nobuto/ubuntu/vivid/unzip/fallback-encoding into lp:ubuntu/unzip.