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

[leigh123linux]

commit c79f1aee09a6bc2d57e2cdd9b287be4a6947b896
Merge: 7fbe9a7 d37fd34
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 18 17:12:42 2014 +0000

    Merge branch 'master' into f20

 cinnamon-fedora-20.gschema.override |    2 +-
 cinnamon-fedora.gschema.override    |    2 +-
 cinnamon.spec                       |    7 ++++++-
 default_panal_launcher.patch        |   11 +++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)
---