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

[leigh123linux]

commit 2cfe83496ef59e66ca23655574451b7d75a71a5b
Merge: e7d1b34 a088a7b
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Mar 5 18:09:10 2014 +0000

    Merge branch 'master' into f20

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