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

[leigh123linux]

commit 4512fc6ded3c26c7ddf8867395ed4447d5b7f57b
Merge: bc48132 0edf800
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Dec 2 02:04:09 2013 +0000

    Merge branch 'master' into f19

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