[cinnamon-control-center/f21: 4/4] Merge branch 'master' into f21

[leigh123linux]

commit 383f16a8697cd4b4c4eb9889fb8896b92614cee4
Merge: 15b0652 a85ef9e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Oct 1 14:54:35 2014 +0100

    Merge branch 'master' into f21

 .gitignore                   |    1 +
 cinnamon-control-center.spec |   21 +++++++++++----------
 sources                      |    2 +-
 upower-0.99.patch            |   21 ---------------------
 4 files changed, 13 insertions(+), 32 deletions(-)
---