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

[leigh123linux]

commit 43fd31f1e20b9055b2580787520c4b287c793c7f
Merge: ae188cd 822be1e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Oct 31 12:56:20 2014 +0000

    Merge branch 'master' into f21

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