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

[Nick Bebout]

commit 3a5f533abfb056edd17f2ac2a8833d5a26adc32a
Merge: 27b8bc6 0a5ad7b
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Feb 24 19:18:41 2011 -0600

    Merge branch 'master' into f14

 .gitignore                        |    1 +
 sources                           |    2 +-
 znc-0.097.svn2213-modpython.patch |   23 -----------------------
 znc.spec                          |   26 +++++++++++++++-----------
 4 files changed, 17 insertions(+), 35 deletions(-)
---