commit a6f4078d3c10f394ab86770321368e1cd344a64b Merge: 4ab5a36 6e5c0b7 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:25:27 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ kfloppy.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---