[mate-backgrounds/epel7: 10/10] Merge branch 'master' into epel7

[Dan Mashal]

commit cd1324c88eee4e05d46b57ead8e454e2d4bdaad1
Merge: 2a9b16e f3d2fe6
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Mar 18 01:54:29 2014 -0700

    Merge branch 'master' into epel7

 .gitignore            |    6 +++++-
 mate-backgrounds.spec |   31 ++++++++++++++++++++++++-------
 sources               |    2 +-
 3 files changed, 30 insertions(+), 9 deletions(-)
---