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

[leigh123linux]

commit dad1b967d045b28713b80e960da4b63ae24c1f90
Merge: 383f16a facd217
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 7 09:43:17 2014 +0100

    Merge branch 'master' into f21

 cinnamon-control-center.spec |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---