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

[Rex Dieter]

commit c72d0a03da0e7ff9445b23c363eb8e6eeb8bdee1
Merge: 167ffb6 f8f0eb3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 16:59:47 2014 -0500

    Merge branch 'master' into f20

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