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

[Rex Dieter]

commit 1227f73475b8560d75d98937d5d8fc76d9fcebcb
Merge: 7955ba2 089658d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:07:16 2014 -0600

    Merge branch 'master' into f20

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