[Merge] lp:~noskcaj/ubuntu/vivid/gnome-keyring/3.15.90 into lp:ubuntu/gnome-keyring

[Iain Lane]

Thanks.

Could you propose merges against the Vcs-Bzr in future when working on desktop packages?

I'll copy your changes manually this time. (and take the revert for bgo #744280)
-- 
https://code.launchpad.net/~noskcaj/ubuntu/vivid/gnome-keyring/3.15.90/+merge/251325
Your team Ubuntu branches is requested to review the proposed merge of lp:~noskcaj/ubuntu/vivid/gnome-keyring/3.15.90 into lp:ubuntu/gnome-keyring.