commit 86766fbc08d32814af5ff293e20aef1312602b87 Merge: 3ba1d43 94323e7 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:52:30 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ rocs.spec | 21 ++++++++++++++++++++- sources | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) ---