[nginx/epel7: 5/5] Merge branch 'master' into epel7

[Jamie Nguyen]

commit bb4239efa0715fcf8b62e0448d4d739d27e8bb5f
Merge: 09d7176 790674d
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 20:14:38 2014 +0100

    Merge branch 'master' into epel7

 nginx.conf |   68 +++++------------------------------------------------------
 nginx.spec |   46 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 66 deletions(-)
---