commit a27b01f875c1d9c0233b0bebd1d30e7942f26efb Merge: 194e71d 011ad43 Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 23:05:18 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ kmix.spec | 24 +++++++++++++++++++++++- sources | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) ---