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

[Dan Mashal]

commit 6a3a40f89f306cda56dc4d2136d7d8271ab82bfd
Merge: 5bd2635 192e0f5
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Jul 23 20:59:54 2012 -0700

    Merge branch 'master' into f16
    
    Conflicts:
    	BitchX.spec
    	sources

 BitchX.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---