commit 939e4e0760eefb9516a9582dab1ab43db3a1c74e Merge: e44393b 98b9931 Author: Michael Schwendt <mschwendt at fedoraproject.org> Date: Sun Apr 17 22:34:47 2011 +0200 Merge branch 'f15' into f14 .gitignore | 1 + audacious.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) ---