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

[Nick Bebout]

commit c3fe71933752fa4dbffc9cab43db0d4ec5e8e37f
Merge: c10f5a4 fa53c07
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Aug 13 17:38:37 2011 -0500

    Merge branch 'master' into f14

 .gitignore          |    4 ++
 sources             |    2 +-
 znc-modperl.patch   |   11 ++++
 znc-modpython.patch |   11 ++++
 znc-release.patch   |    6 +-
 znc.init            |   90 +++++++++++++++++++++++++++++++
 znc.service         |   11 ++++
 znc.spec            |  146 ++++++++++++++++++++++++++++++++++++---------------
 8 files changed, 234 insertions(+), 47 deletions(-)
---