[Merge] lp:~3v1n0/gnome-screensaver/use-unity-lockscreen into lp:ubuntu/gnome-screensaver

[Martin Pitt]

https://launchpad.net/ubuntu/+source/gnome-screensaver/3.6.1-0ubuntu10
-- 
https://code.launchpad.net/~3v1n0/gnome-screensaver/use-unity-lockscreen/+merge/210285
Your team Ubuntu branches is requested to review the proposed merge of lp:~3v1n0/gnome-screensaver/use-unity-lockscreen into lp:ubuntu/gnome-screensaver.