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

[Rex Dieter]

commit 1015340a9891a629e156315bd5a54ee634e18808
Merge: de1b142 c331fe7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:32:52 2014 -0500

    Merge branch 'master' into f20

 kdetoys.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---