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

[Dan Mashal]

commit 46411c9a72aff9c3040a63b4be2d88aa34b9bb13
Merge: 1e8f95a aef761e
Author: Dan Mashal <vicodan at fedoraproject.org>
Date:   Tue May 15 07:28:11 2012 -0700

    Merge branch 'master' into f16

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