[znc/el5/master: 55/55] Merge branch 'master' into el5

[Nick Bebout]

commit bb7a57a006080f5bd6bf05c3e995fba01cc585ca
Merge: eb166c6 f95c44a
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Aug 10 21:07:56 2010 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources
    	znc.spec

 .gitignore |    2 +-
 sources    |    2 +-
 znc.spec   |   20 ++++++++++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 05901f4,09fc48a..080b9ee
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
--znc-0.092.tar.gz
 -znc-0.093.svn2098.tar.bz2
+ znc-0.093.svn2101.tar.bz2