commit f40d129abbf3123b7b353a00614ebca5068732e3 Merge: 6a7cfaf d5169ea Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 23:17:58 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ ktuberling.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---