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

[Wolfgang Ulbrich]

commit f323cf060fe5adb80146902b60d883fa4ecb65bf
Merge: a36ec42 a36dcb3
Author: raveit65 <chat-to-me at raveit.de>
Date:   Tue Mar 10 00:51:30 2015 +0100

    Merge branch 'f21' into f20

 mate-screensaver.spec                         |  8 ++++-
 mate-screensaver_fix-polish-translation.patch | 42 +++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
---