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

[leigh123linux]

commit c3cb56028cfb5fe0845530a4f5bd2b2cc7f812d3
Merge: 83be69a dc87662
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat May 10 17:46:44 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, 138 insertions(+), 2 deletions(-)
---