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

[Rex Dieter]

commit 8044a441a9ca0e65e45bc645b1707790727441a2
Merge: d7d1056 aa7f4eb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 19:02:10 2014 -0600

    Merge branch 'master' into f20

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