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

[Rex Dieter]

commit c6c38702c74c666f64e212c8c14e4747a7c17e92
Merge: 3fd7102 cc496e7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 13:32:11 2015 -0600

    Merge branch 'master' into f20

 .gitignore    |   28 ++--------------------------
 libksane.spec |   23 ++++++++++++++---------
 sources       |    2 +-
 3 files changed, 17 insertions(+), 36 deletions(-)
---