Viewing all changes in revision 1422.

Committer: CI Train Bot
Author(s): Ken VanDine
Date: 2015-05-27 09:22:57 UTC
mfrom: <a title="Merged From 1387.2.2" href="/~system-settings-touch/ubuntu-system-settings/trunk/revision/1387.2.2">(1387.2.2 dim-timeout-1437510)
Revision ID: ci-train-bot@canonical.com-20150527092257-o7lsda8xhgui407w

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

added added

removed removed