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

[Rex Dieter]

commit a1dd63d9ca4eab21c157a5614b36a46f9da725ca
Merge: 4ddebb9 68a35dc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:27:25 2014 -0500

    Merge branch 'master' into f20

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