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

[Rex Dieter]

commit 95126825669f6f042603f226000994792d3c4884
Merge: 5e752cd c7b9313
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 16:42:23 2014 -0500

    Merge branch 'master' into f20

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