commit 8f01f9dd84c86001472801a8bd047252da054b4a Merge: d292180 2ba2b14 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Jan 20 10:42:24 2015 -0600 Merge branch 'master' into f20 .gitignore | 1 + ktimer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) ---