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

[Rex Dieter]

commit daf7cc4f5bfc97b3eb66934f39e3cb67bfb137de
Merge: a742247 e8dd618
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 1 08:44:46 2014 -0500

    Merge branch 'master' into f20

 .gitignore                        |    6 ++++++
 libkdcraw-4.12.0-LibRaw_014.patch |   12 ------------
 libkdcraw.spec                    |   29 +++++++++++++++++++++++------
 sources                           |    2 +-
 4 files changed, 30 insertions(+), 19 deletions(-)
---