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

[Rex Dieter]

commit 9bd9d55510fe7a7b130f4fd8a334638eb24d4bfb
Merge: bd94db2 d1a2bfc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:32:26 2014 -0500

    Merge branch 'master' into f20

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