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

[leigh123linux]

commit 1e7b3ac19b822a15c3c843d7697dd530645f3cbc
Merge: af4a114 1525e30
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Jan 24 20:18:05 2015 +0000

    Merge branch 'master' into f20

 cinnamon-fedora.gschema.override |    2 +-
 cinnamon.spec                    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---