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

[Jamie Nguyen]

commit 5586f9b70baed24a92eeec2c720bbfbf74869ae9
Merge: 888fb95 9b69a88
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 20:11:56 2014 +0100

    Merge branch 'f20' into f19

 nginx.spec |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
---