[kfloppy/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit d1610169405ab29fe2a2f89fb5226c7fa0b677d0
Merge: 259a772 2f3ff26
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 09:19:36 2013 -0600

    Merge branch 'f18' into f17

 .gitignore   |    7 +------
 kfloppy.spec |   21 ++++++++++++++++++---
 sources      |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---