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

[Rex Dieter]

commit 7d60973f2e4a22120db986651cfcb686289c2871
Merge: 1571568 adb499b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 16:50:38 2014 -0500

    Merge branch 'master' into f20

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