commit 2e4732681f464eec8163559d798d685fdb610353 Merge: 9198c78 b5e49bd Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 08:58:00 2013 -0600 Merge branch 'f18' into f17 .gitignore | 1 + kanagram.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) ---