[nginx/el6: 29/29] Merge branch 'f16' into el6

[Jamie Nguyen]

commit 05971045633ad0060eb9d97c60634ec2106a1a81
Merge: 6a12fae c615895
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Thu Apr 19 18:03:33 2012 +0100

    Merge branch 'f16' into el6
    
    Conflicts:
    	.gitignore
    	nginx.spec
    	sources

 .gitignore |    2 +-
 nginx.spec |    6 +++++-
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---