[mate-themes/f21: 3/3] Merge branch 'master' into f21

[Wolfgang Ulbrich]

commit 7dfab6507d3f9208fd085c451a614265dc0b8e0e
Merge: 1f96c92 6321d9e
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Dec 31 23:16:40 2014 +0100

    Merge branch 'master' into f21

 .gitignore       |    1 +
 mate-themes.spec |   17 ++++++++++-------
 sources          |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)
---