[libksane/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 5e752cd15c297c75a5af4d663d2e8f17acced78a
Merge: c72d0a0 c21385e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 23:03:22 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    1 +
 libksane.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---