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

[leigh123linux]

commit 6db1ec3199196c37dbc39819b0a9da1c851288f2
Merge: 69687ec 0edf800
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Dec 2 02:03:24 2013 +0000

    Merge branch 'master' into f20

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