[audiocd-kio/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 4942fccdd733173489db4137a14754898b641b7a
Merge: 5e972ff c602856
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 21:42:22 2014 -0500

    Merge branch 'master' into f20

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