[mate-settings-daemon/f20: 2/2] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/mate-settings-daemon into f20

[Wolfgang Ulbrich]

commit 7a53fda6aa49dbc69d7fefc8d8b9fe679e9735cd
Merge: 95896a7 c3422cb
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Jul 26 15:11:47 2014 +0200

    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/mate-settings-daemon into f20

 mate-settings-daemon.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---