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

[Wolfgang Ulbrich]

commit 8cfd6c7decb4ac1925b9caffe00c06cbce55c7e1
Merge: 2f7e1ae 312e2dd
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Sep 13 16:58:21 2013 +0200

    Merge branch 'master' into f18

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