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

[Nick Bebout]

commit abdc58aad573333fdc2bec57188351079bd97a9b
Merge: 4411e2f dc98579
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Nov 6 22:54:38 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 sources    |    2 +-
 znc.spec   |   12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index e6db9a6,610bf84..23b6b7e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--znc-0.094.tar.gz
+ /znc-0.096.tar.gz