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

[Rex Dieter]

commit 1f1da7b64199cb1a1fbeff6452771e0a2bd9ff38
Merge: 80d8f8b 3b60da5
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 14:35:10 2015 -0600

    Merge branch 'master' into f20

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