[cinnamon-control-center/f20: 2/2] Merge branch 'master' into f20

[leigh123linux]

commit 45bc2b5c2bd7f1d07ead7abcd9d7af2a91476a26
Merge: d14f1b5 b03e0f6
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Nov 12 18:53:26 2014 +0000

    Merge branch 'master' into f20

 .gitignore                   |    1 +
 cinnamon-control-center.spec |    5 ++++-
 sources                      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---