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

[Rex Dieter]

commit 47b9acc975b299aef6df24d2614472eca1885c1f
Merge: 0861356 49c9a4b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:05:42 2014 -0600

    Merge branch 'master' into f20

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