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

[Dan Mashal]

commit c148c4bb626c1f172c3736820cabcc8640cc32a2
Merge: 5f3f328 4f8f4cd
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Apr 1 15:50:34 2013 -0700

    Merge branch 'master' into f17

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---