[kdeartwork/f20: 16/16] Merge branch 'master' into f20

[Rex Dieter]

commit 173101659dcb09c1e70de13e769616568e607417
Merge: c754d9a cf11119
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:48:08 2014 -0600

    Merge branch 'master' into f20

 .gitignore      |   19 +++++-----------
 kdeartwork.spec |   64 ++++++++++++++++++++++++++++++++++++++++++-------------
 sources         |    2 +-
 3 files changed, 56 insertions(+), 29 deletions(-)
---