Merge branch 'master' into el5

Conflicts:
	.gitignore

.gitignore

@@ -1 +1,5 @@
+<<<<<<< HEAD
 znc-0.093.svn2101.tar.bz2
+=======
+znc-0.094.tar.gz
+>>>>>>> master

sources

@@ -1 +1 @@
-c3a67b46669774cf02c31156f03c4643  znc-0.093.svn2101.tar.bz2
+db101f7a7756285d824b59e3b33e3ad5  znc-0.094.tar.gz

znc.spec

@@ -1,14 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.093
-Release:        2.svn2101%{?dist}
+Version:        0.094
+#Release:        2.svn2101%{?dist}
 #Release:        0.1.rc1%{?dist}
-#Release:        1%{?dist}
+Release:        1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-#Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source0:        znc-0.093.svn2101.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:        znc-0.093.svn2101.tar.bz2
 # svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk
 # mv trunk znc-0.093.svn2101
 # tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/
@@ -45,7 +45,7 @@ Requires:      %{name} = %{version}-%{release}
 Extra modules for ZNC
 
 %prep
-%setup -q -n znc-0.093.svn2101
+%setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -135,6 +135,9 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/shell.so
 
 %changelog
+* Fri Sep 10 2010 Nick Bebout <nb@fedoraproject.org> - 0.094-1
+- Update to znc 0.094
+
 * Tue Aug 10 2010 Nick Bebout <nb@fedoraproject.org> - 0.093-2.svn2101
 - Update to znc 0.093.svn2101 to fix CVE-2010-2812 and CVE-2010-2934