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

[Dan Mashal]

commit de71829a8a12ac9b72a0d57385cb24dab5a1c76d
Merge: e19866f b9f83dd
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Nov 1 03:34:25 2012 -0700

    Merge branch 'master' into f17

 BitchX.spec |    6 +++++-
 sources     |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
---