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

[Dan Mashal]

commit 699b6b8542c903b0d427c9aefc9c4967f48b3ab6
Merge: 21e7c68 aef761e
Author: Dan Mashal <vicodan at fedoraproject.org>
Date:   Tue May 15 07:29:09 2012 -0700

    Merge branch 'master' into f15

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