[mate-icon-theme/f18: 2/2] Merge branch 'master' into f18

[Dan Mashal]

commit cda70413250cd335f5d56f04daad2899958cbe51
Merge: 2ebc8ad b61354a
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Thu May 23 20:25:41 2013 -0700

    Merge branch 'master' into f18

 .gitignore           |    1 +
 mate-icon-theme.spec |    7 +++++--
 sources              |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---