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

[Nick Bebout]

commit d6fce3700700771e0856bf9aa48157fc2aa289e8
Merge: 30e5641 4be524e
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Sep 24 20:30:08 2010 -0400

    Merge branch 'master' into f13

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |   15 +++++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index dd77817,6db2470..bc04db0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -znc-0.092.tar.gz
  znc-0.093.svn2098.tar.bz2
  znc-0.093.svn2101.tar.bz2
+ /znc-0.094.tar.gz