[quodlibet/f20: 2/2] Merge branch 'master' into f20

[hannes]

commit 32530bb63f5ad1f47512d6b5747459a12cc0b08c
Merge: e10b6e5 d69d4c6
Author: hannes <hannes at fedoraproject.org>
Date:   Sat Jan 3 09:05:20 2015 +0100

    Merge branch 'master' into f20
    
    Update to 3.3.0

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