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

[Rex Dieter]

commit de1b142242655012a9859d0422ab3c31ddc88ea8
Merge: d9c86f2 cad0141
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:55:16 2014 -0500

    Merge branch 'master' into f20

 kdetoys.spec |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
---