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

[hannes]

commit 2cb84177a3f83bc4f7729912c746d131f0c4a2c8
Merge: e90ecdb 695daaa
Author: hannes <hannes at fedoraproject.org>
Date:   Wed Feb 6 06:50:58 2013 +0100

    Merge branch 'master' into f17

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