Viewing all changes in revision 1643.

Committer: CI Train Bot
Author(s): Ken VanDine
Date: 2016-04-29 19:25:42 UTC
mfrom: <a title="Merged From 1636.4.1" href="/~ci-train-bot/ubuntu-system-settings/ubuntu-system-settings-ubuntu-yakkety-landing-029/revision/1636.4.1">(1636.4.1 lp1569758)
Revision ID: ci-train-bot@canonical.com-20160429192542-tgh1rl27p1pkwrqq

Fixes to sleep/idle settings from Pat McGowan
Fixes: #1367294, #1494514, #1569758
Approved by: Ken VanDine

added added

removed removed