update
Merge pull request #17 from wkshare/master

update nginx-1.4.2