commit f6393bee548631e22030dda6178322b449e96e4d Merge: b5ac5cf 44b7b6d Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 09:12:08 2013 -0600 Merge branch 'f18' into f17 .gitignore | 1 + kbruch.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) ---