[BitchX/f17: 3/3] Merge branch 'master' into f17

[Dan Mashal]

commit 47f59afc9b62bbb1293e3d8f27934169129a54e8
Merge: cf81386 18b35c4
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Apr 1 14:51:00 2013 -0700

    Merge branch 'master' into f17

 .gitignore  |    1 +
 BitchX.spec |   10 ++++++++--
 sources     |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---