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

[leigh123linux]

commit d0cdc2e2127fd902e80012a3eeecd333132b6e2e
Merge: c3cb560 89832ca
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun May 11 13:11:04 2014 +0100

    Merge branch 'master' into f20

 .gitignore                                         |    1 +
 ...hen-lowering-font-scale-below-1.0-in-a-no.patch |  130 --------------------
 cinnamon.spec                                      |    7 +-
 sources                                            |    2 +-
 4 files changed, 6 insertions(+), 134 deletions(-)
---