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

[leigh123linux]

commit 7d54866bc65507a47aee2a0fefe69d3dddf6e6de
Merge: 945193c d8c5317
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Feb 21 16:44:32 2015 +0000

    Merge branch 'master' into f20

 .gitignore                | 1 +
 cinnamon-screensaver.spec | 5 ++++-
 sources                   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---