[znc/f13/master: 3/4] Merge branch 'master' into f13

[Nick Bebout]

commit f691b7f18ffdd1e540b59d9168126fc442d2f368
Merge: 6c5e91e 3aff4fa
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Feb 15 18:59:11 2011 -0600

    Merge branch 'master' into f13

 .gitignore |    2 ++
 sources    |    2 +-
 znc.spec   |   22 ++++++++++++++--------
 3 files changed, 17 insertions(+), 9 deletions(-)
---