Merge branch 'master' into epel7

This commit is contained in:
Jamie Nguyen 2014-08-05 16:43:47 +01:00
commit c6a4d3a834

View File

@ -27,7 +27,7 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.6.1 Version: 1.6.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: A high performance web server and reverse proxy server Summary: A high performance web server and reverse proxy server
Group: System Environment/Daemons Group: System Environment/Daemons