[Merge] lp:~logan/ubuntu/wily/python-idna/2.0 into lp:ubuntu/python-idna

[Martin Pitt]

Review: Approve

Uploaded, thanks!
-- 
https://code.launchpad.net/~logan/ubuntu/wily/python-idna/2.0/+merge/260031
Your team Ubuntu branches is subscribed to branch lp:ubuntu/python-idna.