[mate-control-center/f19: 3/3] Merge branch 'f20' into f19

[Wolfgang Ulbrich]

commit 8652a278bb4b773853572b57f0e1ced63ed08053
Merge: 8b5d9cd 5f782f6
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Apr 19 14:34:56 2014 +0200

    Merge branch 'f20' into f19

 mate-control-center.spec                        |    8 +++++++-
 mate-control-center_typo-in-gsettings-key.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)
---