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

[Dan Mashal]

commit 7b36906b08953357916597fe2fa1f7b7d181510f
Merge: 39da9b5 04ab8df
Author: Dan Mashal <vicodan at fedoraproject.org>
Date:   Sun Jun 3 03:35:27 2012 -0700

    Merge branch 'master' into f17

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