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

[Jamie Nguyen]

commit 56a5c4943557676be9fc92131dabef21349ca440
Merge: bb4239e ba5e503
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 20:48:10 2014 +0100

    Merge branch 'master' into epel7

 nginx.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---