[audacious-plugins/f14/master: 2/2] Merge branch 'f15' into f14

[Michael Schwendt]

commit cce389c44fb7ff5028754a19418191d3185650a6
Merge: eecf533 32d3000
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Apr 23 10:37:22 2011 +0200

    Merge branch 'f15' into f14

 audacious-plugins-2.4.5-m3u.patch |   12 ++++++++++++
 audacious-plugins.spec            |   20 +++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
---