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

[Rex Dieter]

commit ea049053a149547fdd0d272270d989076e9ce3cf
Merge: 1227f73 a76c2e7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 20:23:09 2015 -0600

    Merge branch 'master' into f20

 .gitignore   |    1 +
 kfloppy.spec |    9 ++++++---
 sources      |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---