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

[Dan Mashal]

commit cf81386e5c9f7c533f193079ef438d75ee622942
Merge: 9d51612 ef17b1c
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Dec 31 23:20:23 2012 -0800

    Merge branch 'master' into f17

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