[Merge] lp:~brunonova/ubuntu/trusty/software-properties/lp1381050_lp1383289 into lp:ubuntu/trusty-proposed/software-properties

[Bruno Nova]

I tested the -proposed update now. Bug #1381050 is not fixed.
It seems your simplification doesn't work after all, Michael (and I didn't test it properly).
@Michael, check what I wrote in that bug report and say something there, or here.

So, it seems I don't rock. :)
-- 
https://code.launchpad.net/~brunonova/ubuntu/trusty/software-properties/lp1381050_lp1383289/+merge/249534
Your team Ubuntu branches is subscribed to branch lp:ubuntu/trusty-proposed/software-properties.