[nginx/f19: 2/2] Merge branch 'f20' into f19

[Jamie Nguyen]

commit 8b81652e2fe062c9a4376d7f0f79e7617a02912a
Merge: e09c57e 63ed934
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 20:45:06 2014 +0100

    Merge branch 'f20' into f19

 nginx.conf |   68 +++++------------------------------------------------------
 nginx.spec |    9 +++++--
 2 files changed, 12 insertions(+), 65 deletions(-)
---