[libkcompactdisc/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 00847badb349a15aaac895107142b9d9a4a184f0
Merge: 7d60973 d16aab7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 23:00:57 2014 -0500

    Merge branch 'master' into f20

 .gitignore           |    1 +
 libkcompactdisc.spec |    5 ++++-
 sources              |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---