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

[Dan Mashal]

commit 3c9cdb94554dfe25062df8d7adc10e5dc894bb77
Merge: 903a75a 3dbf96e
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sat Aug 4 20:03:45 2012 -0700

    Merge branch 'master' into f17
    
    Conflicts:
    	sources

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