[znc/f13/master: 25/25] Merge remote branch 'origin/master' into f13/master

[Nick Bebout]

commit 5838ce0b4f3d02ebde00c92ae343c1c6b0883360
Merge: 1ff73e8 fa6a428
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Aug 10 20:10:04 2010 -0400

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	sources
    	znc.spec

 .gitignore |    2 +-
 sources    |    2 +-
 znc.spec   |   17 +++++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 05901f4,5f7ccc6..c40b684
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--znc-0.092.tar.gz
+ znc-0.093.svn2098.tar.bz2