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

[Rex Dieter]

commit d51a68f851bcdac85e579300bf9bfb43f1fbcde2
Merge: 7155f0a 25dc77a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:27:41 2014 -0500

    Merge branch 'master' into f20

 .gitignore            |    1 +
 kde-base-artwork.spec |    5 ++++-
 sources               |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---