[libkcompactdisc/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit b624ed4569659cff4f6f4fc298591da7fb39204c
Merge: c03258d 09e077b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 06:40:38 2013 -0500

    Merge branch 'master' into f19

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