[Merge] lp:~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065 into lp:ubuntu/precise-proposed/gnome-control-center

[Tim Chen]

Tim Chen has proposed merging lp:~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065 into lp:ubuntu/precise-proposed/gnome-control-center.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #1244065 in gnome-control-center (Ubuntu): "Add more options to the power settings menu"
  https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1244065

For more details, see:
https://code.launchpad.net/~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065/+merge/192472

* Some Canonical OEM partners have requested additional options
  be added to the power option system sleep settings menu.

  Add 20 minutes and 2 hours options to give the user
  more fine-grained controls. (LP: #1244065)
-- 
https://code.launchpad.net/~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065/+merge/192472
Your team Ubuntu branches is subscribed to branch lp:ubuntu/precise-proposed/gnome-control-center.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 24105 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20131024/931d8291/attachment-0002.diff>