[libkcddb/f20: 7/7] Merge branch 'master' into f20

[Rex Dieter]

commit f1040f513fa26e9199ffdad97f4e8132625f6822
Merge: f6d6a77 43b7517
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 13:29:09 2015 -0600

    Merge branch 'master' into f20

 .gitignore    |   31 ++-----------------------------
 libkcddb.spec |   22 +++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 20 insertions(+), 35 deletions(-)
---