[cinnamon-screensaver/f20: 3/3] Merge branch 'master' into f20

[leigh123linux]

commit e59cbbfee1ea145de279994990a89949bacbe209
Merge: bcd1902 fbaeccc
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Aug 25 17:02:53 2014 +0100

    Merge branch 'master' into f20

 CVE-2014-1949.patch       |   30 +++++++++++++++++++++---------
 cinnamon-screensaver.spec |    8 +++++++-
 2 files changed, 28 insertions(+), 10 deletions(-)
---