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

[Dan Mashal]

commit a12c4fcdc753a7a485373f6f62f7fd2a63dbde92
Merge: 47f59af c46b910
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Apr 1 15:03:20 2013 -0700

    Merge branch 'master' into f17

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