[kwooty/f17: 2/2] Merge branch 'f18' into f17

[brummbq]

commit 99e4143894c00fa5ca7a414347442d25eeb03874
Merge: c8fcfe2 aa892c4
Author: Gregor Tätzner <gregor at freenet.de>
Date:   Tue Apr 2 18:06:15 2013 +0200

    Merge branch 'f18' into f17

 .gitignore  |    1 +
 kwooty.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---