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

[Michael Vogt]

I uploaded this now to trusty-proposed.
-- 
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.