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

[Nick Bebout]

commit 30e564182826f632ef24b0944c421eaffb7a0542
Merge: 5838ce0 f95c44a
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Aug 10 20:17:01 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 c40b684,09fc48a..dd77817
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -znc-0.092.tar.gz
  znc-0.093.svn2098.tar.bz2
+ znc-0.093.svn2101.tar.bz2