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

[Rex Dieter]

commit e2375a584de96bf69af3632b98747c92dd9681dc
Merge: 9bd9d55 25208d9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:18:09 2014 -0500

    Merge branch 'master' into f20

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