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

[Wolfgang Ulbrich]

commit 81798d42adae1bc0ea537375cb6cc9b22f3a95da
Merge: ac62228 f3bc1c3
Author: raveit <chat-to-me at raveit.de>
Date:   Sun Jun 23 20:00:11 2013 +0200

    Merge branch 'master' into f18

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---