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

[Wolfgang Ulbrich]

commit 0bd3a5cd3df9ed820d5999c3dfc4ddd0c387dcff
Merge: 1b5778d b21fefa
Author: raveit65 <chat-to-me at raveit.de>
Date:   Tue Sep 3 23:24:31 2013 +0200

    Merge branch 'master' into f18

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