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

[Rex Dieter]

commit 80d8f8bb03dbe0c1c7860b03eab858cbd18c46dd
Merge: 8a2f12b 264c3ef
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 13:29:54 2015 -0600

    Merge branch 'master' into f20

 .gitignore     |    2 ++
 libkdcraw.spec |   12 +++++++++---
 sources        |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---