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

[Rex Dieter]

commit f38a09e43c41c92087c29b0f34382f216105d6c3
Merge: daf7cc4 10735c8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 23:01:21 2014 -0500

    Merge branch 'master' into f20

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