[amarok/f21: 6/6] Merge branch 'master' into f21

[Rex Dieter]

commit 62fffb993087cae852c0f602270454608df200ec
Merge: 225afee e004b24
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 18 22:40:00 2014 -0500

    Merge branch 'master' into f21

 amarok.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---