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

[Rex Dieter]

commit c83a5be85b9c621a0edba625fd7dcb595e0f1dcc
Merge: da79e31 4aba685
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 16:49:36 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    6 ++++++
 libkcddb.spec |   23 ++++++++++++++++++++++-
 sources       |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---