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

[Nick Bebout]

commit 99cb88dd38cbfcd2f31c7a2c4d0be4767eafd877
Merge: 74bc073 0393dbd
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Jan 24 11:24:41 2011 -0600

    Merge branch 'master' into f14

 .gitignore |    3 +++
 sources    |    2 +-
 znc.spec   |   27 ++++++++++++++++++++-------
 3 files changed, 24 insertions(+), 8 deletions(-)
---