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

[Nick Bebout]

commit 7f277ca8a3aa45ccf355fa97d7b2a687810fac76
Merge: abdc58a 6b214a1
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sun Nov 7 16:09:20 2010 -0500

    Merge branch 'master' into f13

 znc.spec |   38 +++++++++++++++++++++++++++++++++-----
 1 files changed, 33 insertions(+), 5 deletions(-)
---