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

[Jamie Nguyen]

commit 045db3c18133149073ed5ff87777c6a6ac970085
Merge: c389da5 ba5e503
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 20:47:43 2014 +0100

    Merge branch 'master' into f21

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