Viewing all changes in revision 1427.

Committer: CI Train Bot
Author(s): jonas-drange
Date: 2015-06-16 17:23:43 UTC
mfrom: <a title="Merged From 1417.9.1" href="/~system-settings-touch/ubuntu-system-settings/15.04/revision/1417.9.1">(1417.9.1 dim-timeout-1437510_rtm)
Revision ID: ci-train-bot@canonical.com-20150616172343-b3sw11k0cq0pl720

Ensure dim-timeout is 10 seconds less than activity-timeout Fixes: #1437510
Approved by: Ken VanDine, PS Jenkins bot

added added

removed removed