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

[Dan Mashal]

commit 783b5702230fa3a510de3b849311b823a22b442b
Merge: 6a3a40f 5b21ceb
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Aug 5 02:56:06 2012 -0700

    Merge branch 'master' into f16
    
    Conflicts:
    	sources

 BitchX.spec |   10 +++++++---
 sources     |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)
---