[mate-screensaver/f20: 3/3] Merge branch 'f21' into f20

[Wolfgang Ulbrich]

commit a36ec42a19cab680cc5547337d937d5520dafb37
Merge: e551a6b e630b7b
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Feb 20 16:02:13 2015 +0100

    Merge branch 'f21' into f20

 mate-screensaver.spec                              |  8 +++-
 ...use-gdm-as-last-condition-for-user-switch.patch | 55 ++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
---