[kfloppy/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit c48d294c9a9b5bae0daec117a74ee2c5d960ec3a
Merge: 5f987ca 0b103f2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:17:43 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    3 +++
 kfloppy.spec |   14 +++++++++++++-
 sources      |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---