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

[Rex Dieter]

commit 5f987cabc8661a7d49ac6bfff5cd3ea17a7812e9
Merge: 899d74d 28c435a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:34:24 2014 -0500

    Merge branch 'master' into f20

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