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

[Rex Dieter]

commit 353ad3db4ce637119dcd97e1abd9d4aa2e514a4f
Merge: ecf0e8b fed0b82
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 15:13:54 2015 -0600

    Merge branch 'master' into f20

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