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

[Michael Vogt]

Review: Approve

I'm happy to sponsor this, sorry that I forgot about it. Could you please add the SRU header to the bugs? See https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template for the details.

-- 
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.