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

[Jamie Nguyen]

commit 1f05349f9ea1da85e681d7578e5ec1884b883ae7
Merge: fd256c6 b55cfc2
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Feb 16 18:02:14 2014 +0000

    Merge branch 'master' into f19

 .gitignore |    2 ++
 nginx.spec |    5 ++++-
 sources    |    4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
---