Merge branch 'master' into f19

Conflicts:
	nginx.spec
	sources

.gitignore

@@ -22,3 +22,5 @@ x86_64/
 /nginx-1.4.1.tar.gz.asc
 /nginx-1.4.2.tar.gz
 /nginx-1.4.2.tar.gz.asc
+/nginx-1.4.3.tar.gz
+/nginx-1.4.3.tar.gz.asc

nginx.spec

@@ -13,11 +13,10 @@
 %global  with_gperftools     1
 %endif
 
-
 Name:              nginx
 Epoch:             1
-Version:           1.4.2
-Release:           3%{?dist}
+Version:           1.4.3
+Release:           1%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -269,6 +268,9 @@ fi
 
 
 %changelog
+* Sun Nov 03 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.3-1
+- update to upstream release 1.4.3
+
 * Fri Aug 09 2013 Jonathan Steffan <jsteffan@fedoraproject.org> - 1:1.4.2-3
 - Add in conditionals to build for non-systemd targets
 

sources

@@ -1 +1,2 @@
-5053bacc7df548890f1c93735bddc81e  nginx-1.4.2.tar.gz
+4740dad2f0ed7f5fa16e8caaa8a9438e  nginx-1.4.3.tar.gz
+ba6ea03eaa1b3ad96cc2dfe1a31722da  nginx-1.4.3.tar.gz.asc