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

[Nick Bebout]

commit 113bad1a9bda99f920a32107c633fc5b17a8be5c
Merge: aea04c8 2a6fea2
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sun Apr 3 02:46:42 2011 +0000

    Merge branch 'master' into f13

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