[Merge] lp:~bregma/light-locker/ubuntu-1.2.0 into lp:ubuntu/light-locker

[Stephen M. Webb]

Stephen M. Webb has proposed merging lp:~bregma/light-locker/ubuntu-1.2.0 into lp:ubuntu/light-locker.

Commit message:
new upstream version 1.2.0 (lp: #1280876)

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #1280876 in light-locker (Ubuntu): "Candidate revision light-locker_1.2.0-0ubuntu1"
  https://bugs.launchpad.net/ubuntu/+source/light-locker/+bug/1280876

For more details, see:
https://code.launchpad.net/~bregma/light-locker/ubuntu-1.2.0/+merge/206630

New upstream version 1.2.0 (lp: #1280876)
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~bregma/light-locker/ubuntu-1.2.0/+merge/206630
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~bregma/light-locker/ubuntu-1.2.0 into lp:ubuntu/light-locker.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140216/82013606/attachment-0003.diff>