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

[Michael Schwendt]

commit 4636a2f1d7dd452f5e69c5440295cefbc936ad0b
Merge: aeb96eb d26a66a
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Mar 26 00:49:55 2011 +0100

    Merge branch 'f15' into f14

 audacious-amidi.desktop |    2 +-
 audacious-plugins.spec  |    5 ++++-
 audacious-sid.desktop   |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---