ubuntu-system-settings

Merge proposals dependent on lp://qastaging/~dgadomski/ubuntu-system-settings/shorter-lock-timeout

  1. shorter-lock-timeout
  2. Dependent merge proposals

lp://qastaging/~dgadomski/ubuntu-system-settings/shorter-lock-timeout has no merge proposals.