[mate-control-center/epel7: 24/24] Merge branch 'master' into epel7

[Dan Mashal]

commit 8415f6ebc89dd7737f4d20a7e65d0f732a2dc2d6
Merge: 8b5d9cd 291a949
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Mar 18 02:08:49 2014 -0700

    Merge branch 'master' into epel7

 .gitignore                                         |    7 +-
 mate-control-center.spec                           |  122 +++++++++++++-------
 ...use-gnome-keyring_instead-of-mate-keyring.patch |   23 ----
 sources                                            |    2 +-
 4 files changed, 87 insertions(+), 67 deletions(-)
---