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

[Rex Dieter]

commit 1a6f505e5b72f400e3b66387799186d3d59c9184
Merge: d51a68f 2d25da3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:08:49 2014 -0500

    Merge branch 'master' into f20

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