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

[Dan Mashal]

commit 8cb17840ca1d0b37cb62d23dd849952c162cfd6b
Merge: 3118cb6 04ab8df
Author: Dan Mashal <vicodan at fedoraproject.org>
Date:   Sun Jun 3 03:37:19 2012 -0700

    Merge branch 'master' into f15

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