commit 70002e5f7bc5683306cd084225dc41e46eabd4a0 Merge: 4396fd6 86653de Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:42:15 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ ksaneplugin.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---