commit cdda44a993a62b232c58625e25d71c97136e1573
Merge: 42e2f7f 7f68eb6
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Sep 5 06:44:55 2013 -0500
Merge branch 'master' into f19
.gitignore | 9 +++++----
libksane.spec | 24 +++++++++++++++++++++---
sources | 2 +-
3 files changed, 27 insertions(+), 8 deletions(-)
---