[znc/f14: 2/2] Merge branch 'master' into f14

[Nick Bebout]

commit 31be4c1731d247cdc9b4854b91688034bf49f4c8
Merge: 0c0e80d 7559684
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sun Aug 14 15:48:50 2011 -0500

    Merge branch 'master' into f14

 znc.spec |   50 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 16 deletions(-)
---