Merge branch 'master' into el6

.gitignore

@@ -28,3 +28,4 @@
 /znc-1.2-beta1.tar.gz
 /znc-1.2-rc2.tar.gz
 /znc-1.2.tar.gz
+/znc-1.4.tar.gz

sources

@@ -1 +1 @@
-ef18e5402a82cc3fcab5c2ac5c2e6f3b  znc-1.2.tar.gz
+630cb74db34d2d5451ba30b47869f6bb  znc-1.4.tar.gz

znc.spec

@@ -11,15 +11,15 @@
 
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        1.2
+Version:        1.4
 #Release:        0.1.20110801git%{?dist}
 #Release:        0.4.rc2%{?dist}
-Release:        3%{?dist}
+Release:        1%{?dist}
 License:        ASL 2.0
 Group:          System Environment/Daemons
 URL:            http://znc.in
-Source0:        http://znc.in/releases/znc-1.2.tar.gz
-Patch0:         znc-crashbug.patch
+Source0:        http://znc.in/releases/znc-1.4.tar.gz
+#Patch0:         znc-crashbug.patch
 
 %if %{use_systemd}
 Source1:        znc.service
@@ -97,7 +97,7 @@ perl module for ZNC
 %prep
 %setup -q -n %{name}-%{version}
 #%setup -q -n znc-1.2-rc2
-%patch0 -p1
+#%patch0 -p1
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp