[kde-base-artwork/f20: 3/3] Merge branch 'master' into f20

[Rex Dieter]

commit 796c69695423638353c1d75679cb8b3746551081
Merge: d17a80d 5be7df0
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:11:58 2015 -0600

    Merge branch 'master' into f20

 .gitignore            | 2 ++
 kde-base-artwork.spec | 8 +++++++-
 sources               | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---