[Merge] lp:~smd-seandavis/ubuntu/trusty/light-locker-settings/trusty-1.2.1 into lp:ubuntu/light-locker-settings

[Logan Rosen]

The proposal to merge lp:~smd-seandavis/ubuntu/trusty/light-locker-settings/trusty-1.2.1 into lp:ubuntu/light-locker-settings has been updated.

    Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~smd-seandavis/ubuntu/trusty/light-locker-settings/trusty-1.2.1/+merge/214362
-- 
https://code.launchpad.net/~smd-seandavis/ubuntu/trusty/light-locker-settings/trusty-1.2.1/+merge/214362
Your team Ubuntu branches is subscribed to branch lp:ubuntu/light-locker-settings.