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

[Dan Mashal]

commit 5f3f328cc6bee5a7a0a697224237a2971f2d0ca8
Merge: a12c4fc bba6501
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Apr 1 15:14:02 2013 -0700

    Merge branch 'master' into f17

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