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

[Rex Dieter]

commit f5a86e43baa9e52c907fc1fb89415115fa028eb3
Merge: 4e41237 bf360e6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 5 11:41:44 2015 -0600

    Merge branch 'master' into f20

 kdeartwork.spec | 78 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 23 deletions(-)
---