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

[Rex Dieter]

commit 7155f0af035014072559bbb652200406f65bdce5
Merge: 2363ec4 d7cbea1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:47:34 2014 -0500

    Merge branch 'master' into f20

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