[znc/el5/master: 4/5] Merge branch 'master' into el5

[Nick Bebout]

commit 5fd9362b70dc16724d1a376051e1a033946d8255
Merge: bb7a57a 428c95d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Sep 24 20:31:47 2010 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 .gitignore |    4 ++++
 sources    |    2 +-
 znc.spec   |   15 +++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 080b9ee,e6db9a6..3319075
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +znc-0.093.svn2101.tar.bz2
++=======
+ znc-0.094.tar.gz
++>>>>>>> master