[kdetoys/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit b79e3c40df41539e8182dd272c9c7d66ad1561bd
Merge: 35d9b29 16b45ba
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:46:56 2012 -0600

    Merge branch 'f18' into f17

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