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

[Michael Schwendt]

commit aeb96eb5adcbdc5a359ce7b5f2fc8dfa67013624
Merge: 46e371d 9e86fb7
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Mar 25 00:04:43 2011 +0100

    Merge branch 'f15' into f14

 audacious-amidi.desktop |   10 ++++++++++
 audacious-plugins.spec  |   20 +++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---