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

[Rex Dieter]

commit ecf0e8bed457a79b9f31bc36c27efbec18474554
Merge: 4942fcc e50cc2c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 17:10:39 2014 -0600

    Merge branch 'master' into f20

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