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

[Rex Dieter]

commit e8b13bb883d9efa0381a7344c4980c884d02a260
Merge: 2043252 0efcea5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:55:59 2014 -0500

    Merge branch 'master' into f20

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