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

[leigh123linux]

commit 8a435f49550713033690f9d29f132055c748f014
Merge: 5b1363e a088a7b
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Mar 5 18:10:46 2014 +0000

    Merge branch 'master' into f19

 cinnamon-desktop-editor.patch |   11 +++++++++++
 cinnamon.spec                 |   12 +++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---