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

[Dan Mashal]

commit d074b1b6d982b57ebbd82ddfb5b42bca0df207d1
Merge: 4d66993 04ab8df
Author: Dan Mashal <vicodan at fedoraproject.org>
Date:   Sun Jun 3 03:36:34 2012 -0700

    Merge branch 'master' into f16

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