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

[leigh123linux]

commit 06a66508f91340fdffe4376f6151025b29ee0d7a
Merge: 7d54866 be3c27e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Mar 18 09:04:47 2015 +0000

    Merge branch 'master' into f20

 ...s-window-x11.c-Fix-some-leaks-readability.patch | 98 ++++++++++++++++++++++
 0002-gs-window-x11.c-Fix-black-background.patch    | 28 +++++++
 cinnamon-screensaver.spec                          |  9 +-
 revert_58a522e.patch                               | 12 ---
 4 files changed, 133 insertions(+), 14 deletions(-)
---