[cinnamon-settings-daemon/f20: 2/2] Merge branch 'master' into f20

[leigh123linux]

commit 49b63caa56a8492ba2a57d4617f883a31d20858c
Merge: a250a4b 922aad2
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon May 5 10:43:37 2014 +0100

    Merge branch 'master' into f20

 cinnamon-settings-daemon.spec |    6 ++-
 upower_critical-action.patch  |  102 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletions(-)
---