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

[Rex Dieter]

commit b98dc19e224cce0a65bb0cfcab889ccc2e515fac
Merge: 26e214e 6664dc8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 16:39:58 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    3 +++
 libkcddb.spec |   14 +++++++++++++-
 sources       |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---