commit 0b86edcd72924856ee65b32d9bd054913c02ee73 Merge: 937f9ed b68c820 Author: Rex Dieter <rdieter at math.unl.edu> Date: Sat Dec 29 07:56:28 2012 -0600 Merge branch 'f18' into f17 .gitignore | 1 + rocs.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---