[phonon: 4/4] Merge branch 'master' into f21

[Rex Dieter]

commit b47547f81dd2e2518424fd01336282f70904857a
Merge: 2d4e11f a1b191b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Oct 17 09:53:52 2014 -0500

    Merge branch 'master' into f21

 .gitignore  |    3 +--
 phonon.spec |    9 +++++++--
 sources     |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---