commit 899d74df6bfd61cfd568592229eaed7536e33a74 Merge: 0869711 1f4a265 Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 22:57:50 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ kfloppy.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---