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

[Dan Mashal]

commit 9a59efc54f89d5389af54cb50e1c848c6708e747
Merge: df8129c ef17b1c
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Dec 31 23:24:03 2012 -0800

    Merge branch 'master' into f16

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