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

[Jamie Nguyen]

commit c389da515f6e004392d246a6c07ebb2bfc7a4dd5
Merge: 4f646ce 790674d
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 19:18:54 2014 +0100

    Merge branch 'master' into f21

 nginx.spec |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---