commit 109b13900b587194c696566afaf1f9fc9f01c577 Merge: 63ae06b 98fb226 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 10:15:44 2013 -0600 Merge branch 'f18' into f17 .gitignore | 7 +------ ksaneplugin.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) ---